chore(release): Bumped to Version 14.84.0

# [14.84.0](https://github.com/frappe/erpnext/compare/v14.83.4...v14.84.0) (2025-03-25)

### Bug Fixes

* assign dialog instance to a variable in update_child_items function ([690a939](690a939572))
* customer credit limit check based on `bypass_credit_limit_check` in Journal Entry ([331ecc1](331ecc1964))
* do not validate if conversion rate is 1 for different currency ([c3447c0](c3447c030a))
* fix lint issues with trailing whitespaces ([df64d2e](df64d2ef4e))
* removed test case ([509c5c4](509c5c4d17))

### Features

* repost accounting ledger for purchase receipt ([88e664b](88e664b79f))

### Performance Improvements

* timeout while renaming cost center ([b9b08c3](b9b08c35ef))

.github/workflows/linters.yml

@@ -9,16 +9,15 @@ 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

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 exclude: 'node_modules|.git'
-default_stages: [pre-commit]
+default_stages: [commit]
 fail_fast: false
 
 

erpnext/__init__.py

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

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

@@ -73,14 +73,9 @@
   "reports_tab",
   "remarks_section",
   "general_ledger_remarks_length",
+  "ignore_is_opening_check_for_reporting",
   "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": [
   {
@@ -484,34 +479,6 @@
    "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 +486,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2025-05-05 12:29:38.302027",
+ "modified": "2025-01-23 13:15:44.077853",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",
@@ -548,4 +515,4 @@
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
-}
+}

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_clearance/bank_clearance.py

@@ -46,6 +46,9 @@ class BankClearance(Document):
 			as_dict=1,
 		)
 
+		if self.bank_account:
+			condition += "and bank_account = %(bank_account)s"
+
 		payment_entries = frappe.db.sql(
 			f"""
 			select
@@ -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:

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/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
@@ -192,31 +190,6 @@ class TestCostCenterAllocation(unittest.TestCase):
 		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}"
 
 		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
 		)

erpnext/accounts/doctype/gl_entry/gl_entry.json

@@ -88,7 +88,8 @@
    "label": "Cost Center",
    "oldfieldname": "cost_center",
    "oldfieldtype": "Link",
-   "options": "Cost Center"
+   "options": "Cost Center",
+   "search_index": 1
   },
   {
    "fieldname": "debit",
@@ -258,7 +259,7 @@
  "idx": 1,
  "in_create": 1,
  "links": [],
- "modified": "2024-03-19 18:30:49.613401",
+ "modified": "2025-03-21 15:29:11.221890",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "GL Entry",
@@ -292,4 +293,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
+}

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 (
@@ -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");

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

@@ -319,7 +319,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");
@@ -330,7 +330,7 @@ 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);
 			});

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -350,25 +350,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
@@ -1590,7 +1580,7 @@ class PaymentEntry(AccountsController):
 
 			# 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):
+				if not ref.payment_request:
 					continue
 
 				# fetch outstanding_amount of `Reference` (Payment Term) and `Payment Request` to allocate new amount
@@ -1641,7 +1631,7 @@ class PaymentEntry(AccountsController):
 					)
 			# 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):
+				if ref.payment_request:
 					continue
 
 				key = (ref.reference_doctype, ref.reference_name, ref.get("payment_term"))

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,13 +32,8 @@ 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},
@@ -206,9 +201,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 +209,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,

erpnext/accounts/doctype/pos_invoice/pos_invoice.py

@@ -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/process_statement_of_accounts/process_statement_of_accounts.json

@@ -12,7 +12,7 @@
   "posting_date",
   "company",
   "account",
-  "categorize_by",
+  "group_by",
   "cost_center",
   "territory",
   "ignore_exchange_rate_revaluation_journals",
@@ -172,6 +172,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",
@@ -387,18 +395,10 @@
    "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": "2024-10-18 17:51:39.108481",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Statement Of Accounts",
@@ -433,4 +433,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py

@@ -145,7 +145,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,
@@ -449,7 +449,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/purchase_invoice/purchase_invoice.js

@@ -29,10 +29,7 @@ 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,
-				},
+				filters: { company: doc.company },
 			};
 		});
 	}

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -173,12 +173,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")
@@ -786,7 +781,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,9 +1016,6 @@ 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)},
@@ -1132,30 +1124,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):

erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

@@ -1816,16 +1816,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 +1852,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",
@@ -1980,78 +1984,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/repost_accounting_ledger/repost_accounting_ledger.py

@@ -151,7 +151,7 @@ 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":
@@ -163,7 +163,7 @@ def start_repost(account_repost_doc=str) -> None:
 				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.make_gl_entries_on_cancel()
 
 					doc.docstatus = 1
 					doc.make_gl_entries(from_repost=True)

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -91,8 +91,8 @@ class SalesInvoice(SellingController):
 			self.indicator_title = _("Paid")
 
 	def validate(self):
-		self.validate_auto_set_posting_time()
 		super().validate()
+		self.validate_auto_set_posting_time()
 
 		if not (self.is_pos or self.is_debit_note):
 			self.so_dn_required()
@@ -498,13 +498,7 @@ class SalesInvoice(SellingController):
 				"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().set_missing_values(for_validate)
 
@@ -1025,6 +1019,7 @@ class SalesInvoice(SellingController):
 
 				self.make_exchange_gain_loss_journal()
 			elif self.docstatus == 2:
+				cancel_exchange_gain_loss_journal(frappe._dict(doctype=self.doctype, name=self.name))
 				make_reverse_gl_entries(voucher_type=self.doctype, voucher_no=self.name)
 
 			if update_outstanding == "No":

erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

@@ -416,9 +416,9 @@ class TestSalesInvoice(FrappeTestCase):
 			for i, k in enumerate(expected_values["keys"]):
 				self.assertEqual(d.get(k), expected_values[d.account_head][i])
 
-		self.assertEqual(si.base_grand_total, 1500)
-		self.assertEqual(si.grand_total, 1500)
-		self.assertEqual(si.rounding_adjustment, 0)
+		self.assertEqual(si.base_grand_total, 1500.01)
+		self.assertEqual(si.grand_total, 1500.01)
+		self.assertEqual(si.rounding_adjustment, -0.01)
 
 	def test_discount_amount_gl_entry(self):
 		frappe.db.set_value("Company", "_Test Company", "round_off_account", "Round Off - _TC")
@@ -2828,60 +2828,6 @@ class TestSalesInvoice(FrappeTestCase):
 		self.assertEqual(sales_invoice.items[0].item_tax_template, "_Test Account Excise Duty @ 10 - _TC")
 		self.assertEqual(sales_invoice.items[0].item_tax_rate, item_tax_map)
 
-	def test_item_tax_template_change_with_grand_total_discount(self):
-		"""
-		Test that when item tax template changes due to discount on Grand Total,
-		the tax calculations are consistent.
-		"""
-		item = create_item("Test Item With Multiple Tax Templates")
-
-		item.set("taxes", [])
-		item.append(
-			"taxes",
-			{
-				"item_tax_template": "_Test Account Excise Duty @ 10 - _TC",
-				"minimum_net_rate": 0,
-				"maximum_net_rate": 500,
-			},
-		)
-
-		item.append(
-			"taxes",
-			{
-				"item_tax_template": "_Test Account Excise Duty @ 12 - _TC",
-				"minimum_net_rate": 501,
-				"maximum_net_rate": 1000,
-			},
-		)
-
-		item.save()
-
-		si = create_sales_invoice(item=item.name, rate=700, do_not_save=True)
-		si.append(
-			"taxes",
-			{
-				"charge_type": "On Net Total",
-				"account_head": "_Test Account Excise Duty - _TC",
-				"cost_center": "_Test Cost Center - _TC",
-				"description": "Excise Duty",
-				"rate": 0,
-			},
-		)
-		si.insert()
-
-		self.assertEqual(si.items[0].item_tax_template, "_Test Account Excise Duty @ 12 - _TC")
-
-		si.apply_discount_on = "Grand Total"
-		si.discount_amount = 300
-		si.save()
-
-		# Verify template changed to 10%
-		self.assertEqual(si.items[0].item_tax_template, "_Test Account Excise Duty @ 10 - _TC")
-		self.assertEqual(si.taxes[0].tax_amount, 70)  # 10% of 700
-		self.assertEqual(si.grand_total, 470)  # 700 + 70 - 300
-
-		si.submit()
-
 	@change_settings("Selling Settings", {"enable_discount_accounting": 1})
 	def test_sales_invoice_with_discount_accounting_enabled(self):
 		discount_account = create_account(
@@ -3341,7 +3287,6 @@ class TestSalesInvoice(FrappeTestCase):
 		si.posting_date = getdate()
 		si.submit()
 
-	@change_settings("Accounts Settings", {"over_billing_allowance": 0})
 	def test_over_billing_case_against_delivery_note(self):
 		"""
 		Test a case where duplicating the item with qty = 1 in the invoice
@@ -3349,23 +3294,24 @@ class TestSalesInvoice(FrappeTestCase):
 		"""
 		from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
 
+		over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance")
+		frappe.db.set_value("Accounts Settings", None, "over_billing_allowance", 0)
+
 		dn = create_delivery_note()
 		dn.submit()
 
 		si = make_sales_invoice(dn.name)
+		# make a copy of first item and add it to invoice
 		item_copy = frappe.copy_doc(si.items[0])
-		si.save()
-
-		si.items = []  # Clear existing items
 		si.append("items", item_copy)
 		si.save()
 
-		si.append("items", item_copy)
 		with self.assertRaises(frappe.ValidationError) as err:
-			si.save()
+			si.submit()
 
 		self.assertTrue("cannot overbill" in str(err.exception).lower())
-		dn.cancel()
+
+		frappe.db.set_value("Accounts Settings", None, "over_billing_allowance", over_billing_allowance)
 
 	@change_settings(
 		"Accounts Settings",
@@ -3914,89 +3860,6 @@ class TestSalesInvoice(FrappeTestCase):
 		doc = frappe.get_doc("Project", project.name)
 		self.assertEqual(doc.total_billed_amount, si.grand_total)
 
-	def test_create_return_invoice_for_self_update(self):
-		from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
-		from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-		from erpnext.controllers.sales_and_purchase_return import make_return_doc
-
-		invoice = create_sales_invoice()
-
-		payment_entry = get_payment_entry(dt=invoice.doctype, dn=invoice.name)
-		payment_entry.reference_no = "test001"
-		payment_entry.reference_date = getdate()
-
-		payment_entry.save()
-		payment_entry.submit()
-
-		r_invoice = make_return_doc(invoice.doctype, invoice.name)
-
-		r_invoice.update_outstanding_for_self = 0
-		r_invoice.save()
-
-		self.assertEqual(r_invoice.update_outstanding_for_self, 1)
-
-		r_invoice.submit()
-
-		self.assertNotEqual(r_invoice.outstanding_amount, 0)
-
-		invoice.reload()
-
-		self.assertEqual(invoice.outstanding_amount, 0)
-
-	def test_system_generated_exchange_gain_or_loss_je_after_repost(self):
-		from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
-		from erpnext.accounts.doctype.repost_accounting_ledger.test_repost_accounting_ledger import (
-			update_repost_settings,
-		)
-
-		update_repost_settings()
-
-		si = create_sales_invoice(
-			customer="_Test Customer USD",
-			debit_to="_Test Receivable USD - _TC",
-			currency="USD",
-			conversion_rate=80,
-		)
-
-		pe = get_payment_entry("Sales Invoice", si.name)
-		pe.reference_no = "10"
-		pe.reference_date = nowdate()
-		pe.paid_from_account_currency = si.currency
-		pe.paid_to_account_currency = "INR"
-		pe.source_exchange_rate = 85
-		pe.target_exchange_rate = 1
-		pe.paid_amount = si.outstanding_amount
-		pe.received_amount = 8500
-		pe.insert()
-		pe.submit()
-
-		ral = frappe.new_doc("Repost Accounting Ledger")
-		ral.company = si.company
-		ral.append("vouchers", {"voucher_type": si.doctype, "voucher_no": si.name})
-		ral.save()
-		ral.submit()
-
-		je = frappe.qb.DocType("Journal Entry")
-		jea = frappe.qb.DocType("Journal Entry Account")
-		q = (
-			(
-				frappe.qb.from_(je)
-				.join(jea)
-				.on(je.name == jea.parent)
-				.select(je.docstatus)
-				.where(
-					(je.voucher_type == "Exchange Gain Or Loss")
-					& (jea.reference_name == si.name)
-					& (jea.reference_type == "Sales Invoice")
-					& (je.is_system_generated == 1)
-				)
-			)
-			.limit(1)
-			.run()
-		)
-
-		self.assertEqual(q[0][0], 1)
-
 
 def check_gl_entries(doc, voucher_no, expected_gle, posting_date):
 	gl_entries = frappe.db.sql(

erpnext/accounts/doctype/share_balance/share_balance.json

@@ -80,7 +80,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "rate", 
-   "fieldtype": "Currency", 
+   "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -102,7 +102,7 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -199,7 +199,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "amount", 
-   "fieldtype": "Currency", 
+   "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -221,7 +221,7 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -324,7 +324,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2025-12-10 08:06:40.611761", 
+ "modified": "2018-01-10 18:32:36.201124", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Share Balance", 
@@ -339,4 +339,4 @@
  "sort_order": "DESC", 
  "track_changes": 1, 
  "track_seen": 0
-}
+}

erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json

@@ -75,7 +75,7 @@
   },
   {
    "default": "0",
-   "description": "Only payment entries with apply tax withholding unchecked will be considered for checking cumulative threshold breach",
+   "description": "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach",
    "fieldname": "consider_party_ledger_amount",
    "fieldtype": "Check",
    "label": "Consider Entire Party Ledger Amount",
@@ -102,11 +102,10 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-07-30 07:13:51.785735",
+ "modified": "2021-07-27 21:47:34.396071",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Tax Withholding Category",
- "naming_rule": "Set by user",
  "owner": "Administrator",
  "permissions": [
   {
@@ -149,4 +148,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
+}

erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py

@@ -622,7 +622,6 @@ def get_tcs_amount(parties, inv, tax_details, vouchers, adv_vouchers):
 	conditions.append(ple.party.isin(parties))
 	conditions.append(ple.voucher_no == ple.against_voucher_no)
 	conditions.append(ple.company == inv.company)
-	conditions.append(ple.posting_date[tax_details.from_date : tax_details.to_date])
 
 	advance_amt = (
 		qb.from_(ple).select(Abs(Sum(ple.amount))).where(Criterion.all(conditions)).run()[0][0] or 0.0

erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py

@@ -243,18 +243,17 @@ class TestTaxWithholdingCategory(FrappeTestCase):
 		frappe.db.set_value(
 			"Customer", "Test TCS Customer", "tax_withholding_category", "Cumulative Threshold TCS"
 		)
-		fiscal_year = get_fiscal_year(today(), company="_Test Company")
 
 		vouchers = []
 
 		# create advance payment
-		pe1 = create_payment_entry(
+		pe = create_payment_entry(
 			payment_type="Receive", party_type="Customer", party="Test TCS Customer", paid_amount=20000
 		)
-		pe1.paid_from = "Debtors - _TC"
-		pe1.paid_to = "Cash - _TC"
-		pe1.submit()
-		vouchers.append(pe1)
+		pe.paid_from = "Debtors - _TC"
+		pe.paid_to = "Cash - _TC"
+		pe.submit()
+		vouchers.append(pe)
 
 		# create invoice
 		si1 = create_sales_invoice(customer="Test TCS Customer", rate=5000)
@@ -276,17 +275,6 @@ class TestTaxWithholdingCategory(FrappeTestCase):
 		# make another invoice
 		# sum of unallocated amount from payment entry and this sales invoice will breach cumulative threashold
 		# TDS should be calculated
-
-		# this payment should not be considered for TCS calculation as it is outside of fiscal year
-		pe2 = create_payment_entry(
-			payment_type="Receive", party_type="Customer", party="Test TCS Customer", paid_amount=10000
-		)
-		pe2.paid_from = "Debtors - _TC"
-		pe2.paid_to = "Cash - _TC"
-		pe2.posting_date = add_days(fiscal_year[1], -10)
-		pe2.submit()
-		vouchers.append(pe2)
-
 		si2 = create_sales_invoice(customer="Test TCS Customer", rate=15000)
 		si2.submit()
 		vouchers.append(si2)

erpnext/accounts/general_ledger.py

@@ -179,15 +179,6 @@ def process_gl_map(gl_map, merge_entries=True, precision=None):
 
 
 def distribute_gl_based_on_cost_center_allocation(gl_map, precision=None):
-	round_off_account, default_currency = frappe.get_cached_value(
-		"Company", gl_map[0].company, ["round_off_account", "default_currency"]
-	)
-	if not precision:
-		precision = get_field_precision(
-			frappe.get_meta("GL Entry").get_field("debit"),
-			currency=default_currency,
-		)
-
 	new_gl_map = []
 	for d in gl_map:
 		cost_center = d.get("cost_center")
@@ -201,11 +192,6 @@ def distribute_gl_based_on_cost_center_allocation(gl_map, precision=None):
 			new_gl_map.append(d)
 			continue
 
-		if d.account == round_off_account:
-			d.cost_center = cost_center_allocation[0][0]
-			new_gl_map.append(d)
-			continue
-
 		for sub_cost_center, percentage in cost_center_allocation:
 			gle = copy.deepcopy(d)
 			gle.cost_center = sub_cost_center

erpnext/accounts/party.py

@@ -552,13 +552,12 @@ def validate_party_accounts(doc):
 
 
 @frappe.whitelist()
-def get_due_date(posting_date, party_type, party, company=None, bill_date=None, template_name=None):
+def get_due_date(posting_date, party_type, party, company=None, bill_date=None):
 	"""Get due date from `Payment Terms Template`"""
 	due_date = None
 	if (bill_date or posting_date) and party:
 		due_date = bill_date or posting_date
-		if not template_name:
-			template_name = get_payment_terms_template(party, party_type, company)
+		template_name = get_payment_terms_template(party, party_type, company)
 
 		if template_name:
 			due_date = get_due_date_from_template(template_name, posting_date, bill_date).strftime("%Y-%m-%d")
@@ -598,34 +597,35 @@ def get_due_date_from_template(template_name, posting_date, bill_date):
 
 
 def validate_due_date(
-	posting_date, due_date, party_type, party, company=None, bill_date=None, template_name=None, doctype=None
+	posting_date, due_date, party_type, party, company=None, bill_date=None, template_name=None
 ):
 	if getdate(due_date) < getdate(posting_date):
 		frappe.throw(_("Due Date cannot be before Posting / Supplier Invoice Date"))
 	else:
-		validate_due_date_with_template(posting_date, due_date, bill_date, template_name, doctype)
+		if not template_name:
+			return
 
+		default_due_date = get_due_date_from_template(template_name, posting_date, bill_date).strftime(
+			"%Y-%m-%d"
+		)
 
-def validate_due_date_with_template(posting_date, due_date, bill_date, template_name, doctype=None):
-	if not template_name:
-		return
+		if not default_due_date:
+			return
 
-	default_due_date = format(get_due_date_from_template(template_name, posting_date, bill_date))
-
-	if not default_due_date:
-		return
-
-	if default_due_date != posting_date and getdate(due_date) > getdate(default_due_date):
-		if frappe.db.get_single_value("Accounts Settings", "credit_controller") in frappe.get_roles():
-			party_type = "supplier" if doctype == "Purchase Invoice" else "customer"
-
-			msgprint(
-				_("Note: Due Date exceeds allowed {0} credit days by {1} day(s)").format(
-					party_type, date_diff(due_date, default_due_date)
-				)
+		if default_due_date != posting_date and getdate(due_date) > getdate(default_due_date):
+			is_credit_controller = (
+				frappe.db.get_single_value("Accounts Settings", "credit_controller") in frappe.get_roles()
 			)
-		else:
-			frappe.throw(_("Due Date cannot be after {0}").format(formatdate(default_due_date)))
+			if is_credit_controller:
+				msgprint(
+					_("Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s)").format(
+						date_diff(due_date, default_due_date)
+					)
+				)
+			else:
+				frappe.throw(
+					_("Due / Reference Date cannot be after {0}").format(formatdate(default_due_date))
+				)
 
 
 @frappe.whitelist()
@@ -903,16 +903,12 @@ def get_party_shipping_address(doctype: str, name: str) -> str | None:
 			["is_shipping_address", "=", 1],
 			["address_type", "=", "Shipping"],
 		],
-		fields=["name", "is_shipping_address"],
+		pluck="name",
+		limit=1,
 		order_by="is_shipping_address DESC",
 	)
 
-	if shipping_addresses and shipping_addresses[0].is_shipping_address == 1:
-		return shipping_addresses[0].name
-	if len(shipping_addresses) == 1:
-		return shipping_addresses[0].name
-	else:
-		return None
+	return shipping_addresses[0] if shipping_addresses else None
 
 
 def get_partywise_advanced_payment_amount(

erpnext/accounts/report/accounts_receivable/accounts_receivable.html

@@ -282,4 +282,4 @@
 			{% } %}
 		</tbody>
 	</table>
-	<p class="text-right text-muted">{%= __("Printed on {0}", [frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())]) %}</p>
+	<p class="text-right text-muted">{{ __("Printed On ") }}{%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}</p>

erpnext/accounts/report/accounts_receivable/accounts_receivable.py

@@ -6,7 +6,6 @@ from collections import OrderedDict
 
 import frappe
 from frappe import _, qb, query_builder, scrub
-from frappe.database.schema import get_definition
 from frappe.query_builder import Criterion
 from frappe.query_builder.functions import Date, Substring, Sum
 from frappe.utils import cint, cstr, flt, getdate, nowdate
@@ -15,10 +14,7 @@ from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
 	get_accounting_dimensions,
 	get_dimension_with_children,
 )
-from erpnext.accounts.utils import (
-	build_qb_match_conditions,
-	get_currency_precision,
-)
+from erpnext.accounts.utils import get_currency_precision
 
 #  This report gives a summary of all Outstanding Invoices considering the following
 
@@ -53,10 +49,6 @@ class ReceivablePayableReport:
 		self.age_as_on = (
 			getdate(nowdate()) if self.filters.report_date > getdate(nowdate()) else self.filters.report_date
 		)
-		self.ple_fetch_method = (
-			frappe.db.get_single_value("Accounts Settings", "receivable_payable_fetch_method")
-			or "Buffered Cursor"
-		)  # Fail Safe
 
 	def run(self, args):
 		self.filters.update(args)
@@ -93,7 +85,13 @@ class ReceivablePayableReport:
 				self.skip_total_row = 1
 
 	def get_data(self):
+		self.get_ple_entries()
 		self.get_sales_invoices_or_customers_based_on_sales_person()
+		self.voucher_balance = OrderedDict()
+		self.init_voucher_balance()  # invoiced, paid, credit_note, outstanding
+
+		# Build delivery note map against all sales invoices
+		self.build_delivery_note_map()
 
 		# Get invoice details like bill_no, due_date etc for all invoices
 		self.get_invoice_details()
@@ -107,46 +105,13 @@ class ReceivablePayableReport:
 		# Get Exchange Rate Revaluations
 		self.get_exchange_rate_revaluations()
 
-		self.prepare_ple_query()
 		self.data = []
-		self.voucher_balance = OrderedDict()
 
-		if self.ple_fetch_method == "Buffered Cursor":
-			self.fetch_ple_in_buffered_cursor()
-		elif self.ple_fetch_method == "UnBuffered Cursor":
-			self.fetch_ple_in_unbuffered_cursor()
-		elif self.ple_fetch_method == "Raw SQL":
-			self.fetch_ple_in_sql_procedures()
-
-		# Build delivery note map against all sales invoices
-		self.build_delivery_note_map()
+		for ple in self.ple_entries:
+			self.update_voucher_balance(ple)
 
 		self.build_data()
 
-	def fetch_ple_in_buffered_cursor(self):
-		self.ple_entries = self.ple_query.run(as_dict=True)
-
-		for ple in self.ple_entries:
-			self.init_voucher_balance(ple)  # invoiced, paid, credit_note, outstanding
-
-		# This is unavoidable. Initialization and allocation cannot happen in same loop
-		for ple in self.ple_entries:
-			self.update_voucher_balance(ple)
-
-		delattr(self, "ple_entries")
-
-	def fetch_ple_in_unbuffered_cursor(self):
-		self.ple_entries = []
-		with frappe.db.unbuffered_cursor():
-			for ple in self.ple_query.run(as_dict=True, as_iterator=True):
-				self.init_voucher_balance(ple)  # invoiced, paid, credit_note, outstanding
-				self.ple_entries.append(ple)
-
-		# This is unavoidable. Initialization and allocation cannot happen in same loop
-		for ple in self.ple_entries:
-			self.update_voucher_balance(ple)
-		delattr(self, "ple_entries")
-
 	def build_voucher_dict(self, ple):
 		return frappe._dict(
 			voucher_type=ple.voucher_type,
@@ -166,22 +131,26 @@ class ReceivablePayableReport:
 			outstanding_in_account_currency=0.0,
 		)
 
-	def init_voucher_balance(self, ple):
-		if self.filters.get("ignore_accounts"):
-			key = (ple.voucher_type, ple.voucher_no, ple.party)
-		else:
-			key = (ple.account, ple.voucher_type, ple.voucher_no, ple.party)
+	def init_voucher_balance(self):
+		# build all keys, since we want to exclude vouchers beyond the report date
+		for ple in self.ple_entries:
+			# get the balance object for voucher_type
 
-		if key not in self.voucher_balance:
-			self.voucher_balance[key] = self.build_voucher_dict(ple)
+			if self.filters.get("ignore_accounts"):
+				key = (ple.voucher_type, ple.voucher_no, ple.party)
+			else:
+				key = (ple.account, ple.voucher_type, ple.voucher_no, ple.party)
 
-		if ple.voucher_type == ple.against_voucher_type and ple.voucher_no == ple.against_voucher_no:
-			self.voucher_balance[key].cost_center = ple.cost_center
+			if key not in self.voucher_balance:
+				self.voucher_balance[key] = self.build_voucher_dict(ple)
 
-		self.get_invoices(ple)
+			if ple.voucher_type == ple.against_voucher_type and ple.voucher_no == ple.against_voucher_no:
+				self.voucher_balance[key].cost_center = ple.cost_center
 
-		if self.filters.get("group_by_party"):
-			self.init_subtotal_row(ple.party)
+			self.get_invoices(ple)
+
+			if self.filters.get("group_by_party"):
+				self.init_subtotal_row(ple.party)
 
 		if self.filters.get("group_by_party") and not self.filters.get("in_party_currency"):
 			self.init_subtotal_row("Total")
@@ -303,79 +272,6 @@ class ReceivablePayableReport:
 				row.paid -= amount
 				row.paid_in_account_currency -= amount_in_account_currency
 
-	def fetch_ple_in_sql_procedures(self):
-		self.proc = InitSQLProceduresForAR()
-
-		build_balance = f"""
-		begin not atomic
-		declare done boolean default false;
-		declare rec1 row type of `{self.proc._row_def_table_name}`;
-		declare ple cursor for {self.ple_query.get_sql()};
-		declare continue handler for not found set done = true;
-
-		open ple;
-		fetch ple into rec1;
-		while not done do
-			call {self.proc.init_procedure_name}(rec1);
-			fetch ple into rec1;
-		end while;
-		close ple;
-
-		set done = false;
-		open ple;
-		fetch ple into rec1;
-		while not done do
-			call {self.proc.allocate_procedure_name}(rec1);
-			fetch ple into rec1;
-		end while;
-		close ple;
-		end;
-		"""
-		frappe.db.sql(build_balance)
-
-		balances = frappe.db.sql(
-			f"""select
-			name,
-			voucher_type,
-			voucher_no,
-			party,
-			party_account `account`,
-			posting_date,
-			account_currency,
-			cost_center,
-			sum(invoiced) `invoiced`,
-			sum(paid) `paid`,
-			sum(credit_note) `credit_note`,
-			sum(invoiced) - sum(paid) - sum(credit_note) `outstanding`,
-			sum(invoiced_in_account_currency) `invoiced_in_account_currency`,
-			sum(paid_in_account_currency) `paid_in_account_currency`,
-			sum(credit_note_in_account_currency) `credit_note_in_account_currency`,
-			sum(invoiced_in_account_currency) - sum(paid_in_account_currency) - sum(credit_note_in_account_currency) `outstanding_in_account_currency`
-			from `{self.proc._voucher_balance_name}` group by name order by posting_date;""",
-			as_dict=True,
-		)
-		for x in balances:
-			if self.filters.get("ignore_accounts"):
-				key = (x.voucher_type, x.voucher_no, x.party)
-			else:
-				key = (x.account, x.voucher_type, x.voucher_no, x.party)
-
-			_d = self.build_voucher_dict(x)
-			for field in [
-				"invoiced",
-				"paid",
-				"credit_note",
-				"outstanding",
-				"invoiced_in_account_currency",
-				"paid_in_account_currency",
-				"credit_note_in_account_currency",
-				"outstanding_in_account_currency",
-				"cost_center",
-			]:
-				_d[field] = x.get(field)
-
-			self.voucher_balance[key] = _d
-
 	def update_sub_total_row(self, row, party):
 		total_row = self.total_row_map.get(party)
 
@@ -868,7 +764,7 @@ class ReceivablePayableReport:
 			index = 4
 		row["range" + str(index + 1)] = row.outstanding
 
-	def prepare_ple_query(self):
+	def get_ple_entries(self):
 		# get all the GL entries filtered by the given filters
 
 		self.prepare_conditions()
@@ -916,15 +812,12 @@ class ReceivablePayableReport:
 			else:
 				query = query.select(ple.remarks)
 
-		if match_conditions := build_qb_match_conditions("Payment Ledger Entry"):
-			query = query.where(Criterion.all(match_conditions))
-
 		if self.filters.get("group_by_party"):
 			query = query.orderby(self.ple.party, self.ple.posting_date)
 		else:
 			query = query.orderby(self.ple.posting_date, self.ple.party)
 
-		self.ple_query = query
+		self.ple_entries = query.run(as_dict=True)
 
 	def get_sales_invoices_or_customers_based_on_sales_person(self):
 		if self.filters.get("sales_person"):
@@ -1311,134 +1204,3 @@ def get_customer_group_with_children(customer_groups):
 			frappe.throw(_("Customer Group: {0} does not exist").format(d))
 
 	return list(set(all_customer_groups))
-
-
-class InitSQLProceduresForAR:
-	"""
-	Initialize SQL Procedures, Functions and Temporary tables to build Receivable / Payable report
-	"""
-
-	_varchar_type = get_definition("Data")
-	_currency_type = get_definition("Currency")
-	# Temporary Tables
-	_voucher_balance_name = "_ar_voucher_balance"
-	_voucher_balance_definition = f"""
-		create temporary table `{_voucher_balance_name}`(
-		name {_varchar_type},
-		voucher_type {_varchar_type},
-		voucher_no {_varchar_type},
-		party {_varchar_type},
-		party_account {_varchar_type},
-		posting_date date,
-		account_currency {_varchar_type},
-		cost_center {_varchar_type},
-		invoiced {_currency_type},
-		paid {_currency_type},
-		credit_note {_currency_type},
-		invoiced_in_account_currency {_currency_type},
-		paid_in_account_currency {_currency_type},
-		credit_note_in_account_currency {_currency_type}) engine=memory;
-	"""
-
-	_row_def_table_name = "_ar_ple_row"
-	_row_def_table_definition = f"""
-		create temporary table `{_row_def_table_name}`(
-		name {_varchar_type},
-		account {_varchar_type},
-		voucher_type {_varchar_type},
-		voucher_no {_varchar_type},
-		against_voucher_type {_varchar_type},
-		against_voucher_no {_varchar_type},
-		party_type {_varchar_type},
-		cost_center {_varchar_type},
-		party {_varchar_type},
-		posting_date date,
-		due_date date,
-		account_currency {_varchar_type},
-		amount {_currency_type},
-		amount_in_account_currency {_currency_type}) engine=memory;
-	"""
-
-	# Function
-	genkey_function_name = "ar_genkey"
-	genkey_function_sql = f"""
-	create function `{genkey_function_name}`(rec row type of `{_row_def_table_name}`, allocate bool) returns char(40)
-	begin
-		if allocate then
-			return sha1(concat_ws(',', rec.account, rec.against_voucher_type, rec.against_voucher_no, rec.party));
-		else
-			return sha1(concat_ws(',', rec.account, rec.voucher_type, rec.voucher_no, rec.party));
-		end if;
-	end
-	"""
-
-	# Procedures
-	init_procedure_name = "ar_init_tmp_table"
-	init_procedure_sql = f"""
-	create procedure ar_init_tmp_table(in ple row type of `{_row_def_table_name}`)
-	begin
-		if not exists (select name from `{_voucher_balance_name}` where name = `{genkey_function_name}`(ple, false))
-		then
-			insert into `{_voucher_balance_name}` values (`{genkey_function_name}`(ple, false), ple.voucher_type, ple.voucher_no, ple.party, ple.account, ple.posting_date, ple.account_currency, ple.cost_center, 0, 0, 0, 0, 0, 0);
-		end if;
-	end;
-	"""
-
-	allocate_procedure_name = "ar_allocate_to_tmp_table"
-	allocate_procedure_sql = f"""
-	create procedure ar_allocate_to_tmp_table(in ple row type of `{_row_def_table_name}`)
-	begin
-		declare invoiced {_currency_type} default 0;
-		declare invoiced_in_account_currency {_currency_type} default 0;
-		declare paid {_currency_type} default 0;
-		declare paid_in_account_currency {_currency_type} default 0;
-		declare credit_note {_currency_type} default 0;
-		declare credit_note_in_account_currency {_currency_type} default 0;
-
-
-		if ple.amount > 0 then
-			if (ple.voucher_type in ("Journal Entry", "Payment Entry") and (ple.voucher_no != ple.against_voucher_no)) then
-				set paid = -1 * ple.amount;
-				set paid_in_account_currency = -1 * ple.amount_in_account_currency;
-			else
-				set invoiced = ple.amount;
-				set invoiced_in_account_currency = ple.amount_in_account_currency;
-			end if;
-		else
-
-		if ple.voucher_type in ("Sales Invoice", "Purchase Invoice") then
-			if (ple.voucher_no = ple.against_voucher_no) then
-				set paid = -1 * ple.amount;
-				set paid_in_account_currency = -1 * ple.amount_in_account_currency;
-			else
-				set credit_note = -1 * ple.amount;
-				set credit_note_in_account_currency = -1 * ple.amount_in_account_currency;
-		end if;
-		else
-			set paid = -1 * ple.amount;
-			set paid_in_account_currency = -1 * ple.amount_in_account_currency;
-		end if;
-
-		end if;
-
-		insert into `{_voucher_balance_name}` values (`{genkey_function_name}`(ple, true), ple.against_voucher_type, ple.against_voucher_no, ple.party, ple.account, ple.posting_date, ple.account_currency,'', invoiced, paid, 0, invoiced_in_account_currency, paid_in_account_currency, 0);
-	end;
-	"""
-
-	def __init__(self):
-		existing_procedures = frappe.db.get_routines()
-
-		if self.genkey_function_name not in existing_procedures:
-			frappe.db.sql(self.genkey_function_sql)
-
-		if self.init_procedure_name not in existing_procedures:
-			frappe.db.sql(self.init_procedure_sql)
-
-		if self.allocate_procedure_name not in existing_procedures:
-			frappe.db.sql(self.allocate_procedure_sql)
-
-		frappe.db.sql(f"drop table if exists `{self._voucher_balance_name}`")
-		frappe.db.sql(self._voucher_balance_definition)
-
-		frappe.db.sql(f"drop table if exists `{self._row_def_table_name}`")
-		frappe.db.sql(self._row_def_table_definition)

erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py

@@ -21,7 +21,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase):
 	def tearDown(self):
 		frappe.db.rollback()
 
-	def create_sales_invoice(self, no_payment_schedule=False, do_not_submit=False, **args):
+	def create_sales_invoice(self, no_payment_schedule=False, do_not_submit=False):
 		frappe.set_user("Administrator")
 		si = create_sales_invoice(
 			item=self.item,
@@ -34,7 +34,6 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase):
 			rate=100,
 			price_list_rate=100,
 			do_not_save=1,
-			**args,
 		)
 		if not no_payment_schedule:
 			si.append(
@@ -112,7 +111,7 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase):
 		self.assertEqual(expected_data[0], [row.invoiced, row.paid, row.credit_note])
 		pos_inv.cancel()
 
-	def test_accounts_receivable_with_payment(self):
+	def test_accounts_receivable(self):
 		filters = {
 			"company": self.company,
 			"based_on_payment_terms": 1,
@@ -152,15 +151,11 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase):
 		cr_note = self.create_credit_note(si.name, do_not_submit=True)
 		cr_note.update_outstanding_for_self = False
 		cr_note.save().submit()
-
-		# as the invoice partially paid and returning the full amount so the outstanding amount should be True
-		self.assertEqual(cr_note.update_outstanding_for_self, True)
-
 		report = execute(filters)
 
-		expected_data_after_credit_note = [0, 0, 100, 0, -100, self.debit_to]
+		expected_data_after_credit_note = [100, 0, 0, 40, -40, self.debit_to]
 
-		row = report[1][-1]
+		row = report[1][0]
 		self.assertEqual(
 			expected_data_after_credit_note,
 			[
@@ -173,105 +168,6 @@ class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase):
 			],
 		)
 
-	def test_accounts_receivable_without_payment(self):
-		filters = {
-			"company": self.company,
-			"based_on_payment_terms": 1,
-			"report_date": today(),
-			"range1": 30,
-			"range2": 60,
-			"range3": 90,
-			"range4": 120,
-			"show_remarks": True,
-		}
-
-		# check invoice grand total and invoiced column's value for 3 payment terms
-		si = self.create_sales_invoice()
-
-		report = execute(filters)
-
-		expected_data = [[100, 30, "No Remarks"], [100, 50, "No Remarks"], [100, 20, "No Remarks"]]
-
-		for i in range(3):
-			row = report[1][i - 1]
-			self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced, row.remarks])
-
-		# check invoice grand total, invoiced, paid and outstanding column's value after credit note
-		cr_note = self.create_credit_note(si.name, do_not_submit=True)
-		cr_note.update_outstanding_for_self = False
-		cr_note.save().submit()
-
-		self.assertEqual(cr_note.update_outstanding_for_self, False)
-
-		report = execute(filters)
-
-		row = report[1]
-		self.assertTrue(len(row) == 0)
-
-	def test_accounts_receivable_with_partial_payment(self):
-		filters = {
-			"company": self.company,
-			"based_on_payment_terms": 1,
-			"report_date": today(),
-			"range1": 30,
-			"range2": 60,
-			"range3": 90,
-			"range4": 120,
-			"show_remarks": True,
-		}
-
-		# check invoice grand total and invoiced column's value for 3 payment terms
-		si = self.create_sales_invoice(qty=2)
-
-		report = execute(filters)
-
-		expected_data = [[200, 60, "No Remarks"], [200, 100, "No Remarks"], [200, 40, "No Remarks"]]
-
-		for i in range(3):
-			row = report[1][i - 1]
-			self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced, row.remarks])
-
-		# check invoice grand total, invoiced, paid and outstanding column's value after payment
-		self.create_payment_entry(si.name)
-		report = execute(filters)
-
-		expected_data_after_payment = [[200, 60, 40, 20], [200, 100, 0, 100], [200, 40, 0, 40]]
-
-		for i in range(3):
-			row = report[1][i - 1]
-			self.assertEqual(
-				expected_data_after_payment[i - 1],
-				[row.invoice_grand_total, row.invoiced, row.paid, row.outstanding],
-			)
-
-		# check invoice grand total, invoiced, paid and outstanding column's value after credit note
-		cr_note = self.create_credit_note(si.name, do_not_submit=True)
-		cr_note.update_outstanding_for_self = False
-		cr_note.save().submit()
-
-		self.assertFalse(cr_note.update_outstanding_for_self)
-
-		report = execute(filters)
-
-		expected_data_after_credit_note = [
-			[200, 100, 0, 80, 20, self.debit_to],
-			[200, 40, 0, 0, 40, self.debit_to],
-		]
-
-		for i in range(2):
-			row = report[1][i - 1]
-			self.assertEqual(
-				expected_data_after_credit_note[i - 1],
-				[
-					row.invoice_grand_total,
-					row.invoiced,
-					row.paid,
-					row.credit_note,
-					row.outstanding,
-					row.party_account,
-				],
-			)
-
 	def test_cr_note_flag_to_update_self(self):
 		filters = {
 			"company": self.company,

erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js

@@ -25,26 +25,11 @@ frappe.query_reports["Asset Depreciations and Balances"] = {
 			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 			reqd: 1,
 		},
-		{
-			fieldname: "group_by",
-			label: __("Group By"),
-			fieldtype: "Select",
-			options: ["Asset Category", "Asset"],
-			default: "Asset Category",
-		},
 		{
 			fieldname: "asset_category",
 			label: __("Asset Category"),
 			fieldtype: "Link",
 			options: "Asset Category",
-			depends_on: "eval: doc.group_by == 'Asset Category'",
-		},
-		{
-			fieldname: "asset",
-			label: __("Asset"),
-			fieldtype: "Link",
-			options: "Asset",
-			depends_on: "eval: doc.group_by == 'Asset'",
 		},
 	],
 };

erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py

@@ -14,28 +14,21 @@ def execute(filters=None):
 
 
 def get_data(filters):
-	if filters.get("group_by") == "Asset Category":
-		return get_group_by_asset_category_data(filters)
-	elif filters.get("group_by") == "Asset":
-		return get_group_by_asset_data(filters)
-
-
-def get_group_by_asset_category_data(filters):
 	data = []
 
-	asset_categories = get_asset_categories_for_grouped_by_category(filters)
-	assets = get_assets_for_grouped_by_category(filters)
+	asset_categories = get_asset_categories(filters)
+	assets = get_assets(filters)
 
 	for asset_category in asset_categories:
 		row = frappe._dict()
+		# row.asset_category = asset_category
 		row.update(asset_category)
 
-		row.value_as_on_to_date = (
-			flt(row.value_as_on_from_date)
-			+ flt(row.value_of_new_purchase)
-			- flt(row.value_of_sold_asset)
-			- flt(row.value_of_scrapped_asset)
-			- flt(row.value_of_capitalized_asset)
+		row.cost_as_on_to_date = (
+			flt(row.cost_as_on_from_date)
+			+ flt(row.cost_of_new_purchase)
+			- flt(row.cost_of_sold_asset)
+			- flt(row.cost_of_scrapped_asset)
 		)
 
 		row.update(
@@ -45,19 +38,17 @@ def get_group_by_asset_category_data(filters):
 				if asset["asset_category"] == asset_category.get("asset_category", "")
 			)
 		)
-
 		row.accumulated_depreciation_as_on_to_date = (
 			flt(row.accumulated_depreciation_as_on_from_date)
 			+ flt(row.depreciation_amount_during_the_period)
 			- flt(row.depreciation_eliminated_during_the_period)
-			- flt(row.depreciation_eliminated_via_reversal)
 		)
 
-		row.net_asset_value_as_on_from_date = flt(row.value_as_on_from_date) - flt(
+		row.net_asset_value_as_on_from_date = flt(row.cost_as_on_from_date) - flt(
 			row.accumulated_depreciation_as_on_from_date
 		)
 
-		row.net_asset_value_as_on_to_date = flt(row.value_as_on_to_date) - flt(
+		row.net_asset_value_as_on_to_date = flt(row.cost_as_on_to_date) - flt(
 			row.accumulated_depreciation_as_on_to_date
 		)
 
@@ -66,71 +57,52 @@ def get_group_by_asset_category_data(filters):
 	return data
 
 
-def get_asset_categories_for_grouped_by_category(filters):
+def get_asset_categories(filters):
 	condition = ""
 	if filters.get("asset_category"):
-		condition += " and a.asset_category = %(asset_category)s"
-
-	# nosemgrep
+		condition += " and asset_category = %(asset_category)s"
 	return frappe.db.sql(
 		f"""
-		SELECT a.asset_category,
-			   ifnull(sum(case when a.purchase_date < %(from_date)s then
-							   case when ifnull(a.disposal_date, 0) = 0 or a.disposal_date >= %(from_date)s then
-									a.gross_purchase_amount
+		SELECT asset_category,
+			   ifnull(sum(case when purchase_date < %(from_date)s then
+							   case when ifnull(disposal_date, 0) = 0 or disposal_date >= %(from_date)s then
+									gross_purchase_amount
 							   else
 									0
 							   end
 						   else
 								0
-						   end), 0) as value_as_on_from_date,
-			   ifnull(sum(case when a.purchase_date >= %(from_date)s then
-			   						a.gross_purchase_amount
+						   end), 0) as cost_as_on_from_date,
+			   ifnull(sum(case when purchase_date >= %(from_date)s then
+			   						gross_purchase_amount
 			   				   else
 			   				   		0
-			   				   end), 0) as value_of_new_purchase,
-			   ifnull(sum(case when ifnull(a.disposal_date, 0) != 0
-			   						and a.disposal_date >= %(from_date)s
-			   						and a.disposal_date <= %(to_date)s then
-							   case when a.status = "Sold" then
-							   		a.gross_purchase_amount
+			   				   end), 0) as cost_of_new_purchase,
+			   ifnull(sum(case when ifnull(disposal_date, 0) != 0
+			   						and disposal_date >= %(from_date)s
+			   						and disposal_date <= %(to_date)s then
+							   case when status = "Sold" then
+							   		gross_purchase_amount
 							   else
 							   		0
 							   end
 						   else
 								0
-						   end), 0) as value_of_sold_asset,
-			   ifnull(sum(case when ifnull(a.disposal_date, 0) != 0
-			   						and a.disposal_date >= %(from_date)s
-			   						and a.disposal_date <= %(to_date)s then
-							   case when a.status = "Scrapped" then
-							   		a.gross_purchase_amount
+						   end), 0) as cost_of_sold_asset,
+			   ifnull(sum(case when ifnull(disposal_date, 0) != 0
+			   						and disposal_date >= %(from_date)s
+			   						and disposal_date <= %(to_date)s then
+							   case when status = "Scrapped" then
+							   		gross_purchase_amount
 							   else
 							   		0
 							   end
 						   else
 								0
-						   end), 0) as value_of_scrapped_asset,
-				ifnull(sum(case when ifnull(a.disposal_date, 0) != 0
-			   						and a.disposal_date >= %(from_date)s
-			   						and a.disposal_date <= %(to_date)s then
-							   case when a.status = "Capitalized" then
-							   		a.gross_purchase_amount
-							   else
-							   		0
-							   end
-						   else
-								0
-						   end), 0) as value_of_capitalized_asset
-		from `tabAsset` a
-		where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s {condition}
-			and not exists(
-				select 1 from `tabAsset Capitalization Asset Item` acai join `tabAsset Capitalization` ac on acai.parent=ac.name
-				where acai.asset = a.name
-				and ac.posting_date < %(from_date)s
-				and ac.docstatus=1
-			)
-		group by a.asset_category
+						   end), 0) as cost_of_scrapped_asset
+		from `tabAsset`
+		where docstatus=1 and company=%(company)s and purchase_date <= %(to_date)s {condition}
+		group by asset_category
 	""",
 		{
 			"to_date": filters.to_date,
@@ -142,17 +114,14 @@ def get_asset_categories_for_grouped_by_category(filters):
 	)
 
 
-def get_assets_for_grouped_by_category(filters):
+def get_assets(filters):
 	condition = ""
 	if filters.get("asset_category"):
-		condition = f" and a.asset_category = '{filters.get('asset_category')}'"
-
-	# nosemgrep
+		condition = " and a.asset_category = '{}'".format(filters.get("asset_category"))
 	return frappe.db.sql(
-		f"""
+		"""
 		SELECT results.asset_category,
 			   sum(results.accumulated_depreciation_as_on_from_date) as accumulated_depreciation_as_on_from_date,
-			   sum(results.depreciation_eliminated_via_reversal) as depreciation_eliminated_via_reversal,
 			   sum(results.depreciation_eliminated_during_the_period) as depreciation_eliminated_during_the_period,
 			   sum(results.depreciation_amount_during_the_period) as depreciation_amount_during_the_period
 		from (SELECT a.asset_category,
@@ -161,11 +130,6 @@ def get_assets_for_grouped_by_category(filters):
 							  else
 								   0
 							  end), 0) as accumulated_depreciation_as_on_from_date,
-				   ifnull(sum(case when gle.posting_date <= %(to_date)s and ifnull(a.disposal_date, 0) = 0 then
-								   gle.credit
-							  else
-								   0
-							  end), 0) as depreciation_eliminated_via_reversal,
 				   ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and a.disposal_date >= %(from_date)s
 										and a.disposal_date <= %(to_date)s and gle.posting_date <= a.disposal_date then
 								   gle.debit
@@ -185,22 +149,15 @@ def get_assets_for_grouped_by_category(filters):
 				aca.parent = a.asset_category and aca.company_name = %(company)s
 			join `tabCompany` company on
 				company.name = %(company)s
-			where
-				a.docstatus=1
-				and a.company=%(company)s
-				and a.purchase_date <= %(to_date)s
-				and gle.is_cancelled = 0
-				and gle.account = ifnull(aca.depreciation_expense_account, company.depreciation_expense_account)
-				{condition}
+			where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s and gle.debit != 0 and gle.is_cancelled = 0 and gle.account = ifnull(aca.depreciation_expense_account, company.depreciation_expense_account) {0}
 			group by a.asset_category
 			union
 			SELECT a.asset_category,
-				   ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and a.disposal_date < %(from_date)s then
+				   ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and (a.disposal_date < %(from_date)s or a.disposal_date > %(to_date)s) then
 									0
 							   else
 									a.opening_accumulated_depreciation
 							   end), 0) as accumulated_depreciation_as_on_from_date,
-				0 as depreciation_eliminated_via_reversal,
 				   ifnull(sum(case when a.disposal_date >= %(from_date)s and a.disposal_date <= %(to_date)s then
 								   a.opening_accumulated_depreciation
 							  else
@@ -208,272 +165,51 @@ def get_assets_for_grouped_by_category(filters):
 							  end), 0) as depreciation_eliminated_during_the_period,
 				   0 as depreciation_amount_during_the_period
 			from `tabAsset` a
-			where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s {condition}
+			where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s {0}
 			group by a.asset_category) as results
 		group by results.asset_category
-		""",
-		{
-			"to_date": filters.to_date,
-			"from_date": filters.from_date,
-			"company": filters.company,
-		},
-		as_dict=1,
-	)
-
-
-def get_group_by_asset_data(filters):
-	data = []
-
-	asset_details = get_asset_details_for_grouped_by_category(filters)
-	assets = get_assets_for_grouped_by_asset(filters)
-
-	for asset_detail in asset_details:
-		row = frappe._dict()
-		row.update(asset_detail)
-
-		row.value_as_on_to_date = (
-			flt(row.value_as_on_from_date)
-			+ flt(row.value_of_new_purchase)
-			- flt(row.value_of_sold_asset)
-			- flt(row.value_of_scrapped_asset)
-			- flt(row.value_of_capitalized_asset)
-		)
-
-		row.update(next(asset for asset in assets if asset["asset"] == asset_detail.get("name", "")))
-
-		row.accumulated_depreciation_as_on_to_date = (
-			flt(row.accumulated_depreciation_as_on_from_date)
-			+ flt(row.depreciation_amount_during_the_period)
-			- flt(row.depreciation_eliminated_during_the_period)
-			- flt(row.depreciation_eliminated_via_reversal)
-		)
-
-		row.net_asset_value_as_on_from_date = flt(row.value_as_on_from_date) - flt(
-			row.accumulated_depreciation_as_on_from_date
-		)
-
-		row.net_asset_value_as_on_to_date = flt(row.value_as_on_to_date) - flt(
-			row.accumulated_depreciation_as_on_to_date
-		)
-
-		data.append(row)
-
-	return data
-
-
-def get_asset_details_for_grouped_by_category(filters):
-	condition = ""
-	if filters.get("asset"):
-		condition += " and a.name = %(asset)s"
-
-	# nosemgrep
-	return frappe.db.sql(
-		f"""
-		SELECT a.name,
-			   ifnull(sum(case when a.purchase_date < %(from_date)s then
-							   case when ifnull(a.disposal_date, 0) = 0 or a.disposal_date >= %(from_date)s then
-									a.gross_purchase_amount
-							   else
-									0
-							   end
-						   else
-								0
-						   end), 0) as value_as_on_from_date,
-			   ifnull(sum(case when a.purchase_date >= %(from_date)s then
-			   						a.gross_purchase_amount
-			   				   else
-			   				   		0
-			   				   end), 0) as value_of_new_purchase,
-			   ifnull(sum(case when ifnull(a.disposal_date, 0) != 0
-			   						and a.disposal_date >= %(from_date)s
-			   						and a.disposal_date <= %(to_date)s then
-							   case when a.status = "Sold" then
-							   		a.gross_purchase_amount
-							   else
-							   		0
-							   end
-						   else
-								0
-						   end), 0) as value_of_sold_asset,
-			   ifnull(sum(case when ifnull(a.disposal_date, 0) != 0
-			   						and a.disposal_date >= %(from_date)s
-			   						and a.disposal_date <= %(to_date)s then
-							   case when a.status = "Scrapped" then
-							   		a.gross_purchase_amount
-							   else
-							   		0
-							   end
-						   else
-								0
-						   end), 0) as value_of_scrapped_asset,
-				ifnull(sum(case when ifnull(a.disposal_date, 0) != 0
-			   						and a.disposal_date >= %(from_date)s
-			   						and a.disposal_date <= %(to_date)s then
-							   case when a.status = "Capitalized" then
-							   		a.gross_purchase_amount
-							   else
-							   		0
-							   end
-						   else
-								0
-						   end), 0) as value_of_capitalized_asset
-		from `tabAsset` a
-		where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s {condition}
-		and not exists(
-				select 1 from `tabAsset Capitalization Asset Item` acai join `tabAsset Capitalization` ac on acai.parent=ac.name
-				where acai.asset = a.name
-				and ac.posting_date < %(from_date)s
-				and ac.docstatus=1
-			)
-		group by a.name
-	""",
-		{
-			"to_date": filters.to_date,
-			"from_date": filters.from_date,
-			"company": filters.company,
-			"asset": filters.get("asset"),
-		},
-		as_dict=1,
-	)
-
-
-def get_assets_for_grouped_by_asset(filters):
-	condition = ""
-	if filters.get("asset"):
-		condition = f" and a.name = '{filters.get('asset')}'"
-
-	# nosemgrep
-	return frappe.db.sql(
-		f"""
-		SELECT results.name as asset,
-			   sum(results.accumulated_depreciation_as_on_from_date) as accumulated_depreciation_as_on_from_date,
-			   sum(results.depreciation_eliminated_via_reversal) as depreciation_eliminated_via_reversal,
-			   sum(results.depreciation_eliminated_during_the_period) as depreciation_eliminated_during_the_period,
-			   sum(results.depreciation_amount_during_the_period) as depreciation_amount_during_the_period
-		from (SELECT a.name as name,
-				   ifnull(sum(case when gle.posting_date < %(from_date)s and (ifnull(a.disposal_date, 0) = 0 or a.disposal_date >= %(from_date)s) then
-								   gle.debit
-							  else
-								   0
-							  end), 0) as accumulated_depreciation_as_on_from_date,
-				   ifnull(sum(case when gle.posting_date <= %(to_date)s and ifnull(a.disposal_date, 0) = 0 then
-								   gle.credit
-							  else
-								   0
-							  end), 0) as depreciation_eliminated_via_reversal,
-				   ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and a.disposal_date >= %(from_date)s
-										and a.disposal_date <= %(to_date)s and gle.posting_date <= a.disposal_date then
-								   gle.debit
-							  else
-								   0
-							  end), 0) as depreciation_eliminated_during_the_period,
-				   ifnull(sum(case when gle.posting_date >= %(from_date)s and gle.posting_date <= %(to_date)s
-										and (ifnull(a.disposal_date, 0) = 0 or gle.posting_date <= a.disposal_date) then
-								   gle.debit
-							  else
-								   0
-							  end), 0) as depreciation_amount_during_the_period
-			from `tabGL Entry` gle
-			join `tabAsset` a on
-				gle.against_voucher = a.name
-			join `tabAsset Category Account` aca on
-				aca.parent = a.asset_category and aca.company_name = %(company)s
-			join `tabCompany` company on
-				company.name = %(company)s
-			where
-				a.docstatus=1
-				and a.company=%(company)s
-				and a.purchase_date <= %(to_date)s
-				and gle.is_cancelled = 0
-				and gle.account = ifnull(aca.depreciation_expense_account, company.depreciation_expense_account)
-				{condition}
-			group by a.name
-			union
-			SELECT a.name as name,
-				   ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and a.disposal_date < %(from_date)s then
-									0
-							   else
-									a.opening_accumulated_depreciation
-							   end), 0) as accumulated_depreciation_as_on_from_date,
-				   0 as depreciation_as_on_from_date_credit,
-				   ifnull(sum(case when a.disposal_date >= %(from_date)s and a.disposal_date <= %(to_date)s then
-								   a.opening_accumulated_depreciation
-							  else
-								   0
-							  end), 0) as depreciation_eliminated_during_the_period,
-				   0 as depreciation_amount_during_the_period
-			from `tabAsset` a
-			where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s {condition}
-			group by a.name) as results
-		group by results.name
-		""",
-		{
-			"to_date": filters.to_date,
-			"from_date": filters.from_date,
-			"company": filters.company,
-		},
+		""".format(condition),
+		{"to_date": filters.to_date, "from_date": filters.from_date, "company": filters.company},
 		as_dict=1,
 	)
 
 
 def get_columns(filters):
-	columns = []
-
-	if filters.get("group_by") == "Asset Category":
-		columns.append(
-			{
-				"label": _("Asset Category"),
-				"fieldname": "asset_category",
-				"fieldtype": "Link",
-				"options": "Asset Category",
-				"width": 120,
-			}
-		)
-	elif filters.get("group_by") == "Asset":
-		columns.append(
-			{
-				"label": _("Asset"),
-				"fieldname": "asset",
-				"fieldtype": "Link",
-				"options": "Asset",
-				"width": 120,
-			}
-		)
-
-	columns += [
+	return [
 		{
-			"label": _("Value as on") + " " + formatdate(filters.day_before_from_date),
-			"fieldname": "value_as_on_from_date",
+			"label": _("Asset Category"),
+			"fieldname": "asset_category",
+			"fieldtype": "Link",
+			"options": "Asset Category",
+			"width": 120,
+		},
+		{
+			"label": _("Cost as on") + " " + formatdate(filters.day_before_from_date),
+			"fieldname": "cost_as_on_from_date",
 			"fieldtype": "Currency",
 			"width": 140,
 		},
 		{
-			"label": _("Value of New Purchase"),
-			"fieldname": "value_of_new_purchase",
+			"label": _("Cost of New Purchase"),
+			"fieldname": "cost_of_new_purchase",
 			"fieldtype": "Currency",
 			"width": 140,
 		},
 		{
-			"label": _("Value of Sold Asset"),
-			"fieldname": "value_of_sold_asset",
+			"label": _("Cost of Sold Asset"),
+			"fieldname": "cost_of_sold_asset",
 			"fieldtype": "Currency",
 			"width": 140,
 		},
 		{
-			"label": _("Value of Scrapped Asset"),
-			"fieldname": "value_of_scrapped_asset",
+			"label": _("Cost of Scrapped Asset"),
+			"fieldname": "cost_of_scrapped_asset",
 			"fieldtype": "Currency",
 			"width": 140,
 		},
 		{
-			"label": _("Value of New Capitalized Asset"),
-			"fieldname": "value_of_capitalized_asset",
-			"fieldtype": "Currency",
-			"width": 140,
-		},
-		{
-			"label": _("Value as on") + " " + formatdate(filters.to_date),
-			"fieldname": "value_as_on_to_date",
+			"label": _("Cost as on") + " " + formatdate(filters.to_date),
+			"fieldname": "cost_as_on_to_date",
 			"fieldtype": "Currency",
 			"width": 140,
 		},
@@ -501,12 +237,6 @@ def get_columns(filters):
 			"fieldtype": "Currency",
 			"width": 270,
 		},
-		{
-			"label": _("Depreciation eliminated via reversal"),
-			"fieldname": "depreciation_eliminated_via_reversal",
-			"fieldtype": "Currency",
-			"width": 270,
-		},
 		{
 			"label": _("Net Asset value as on") + " " + formatdate(filters.day_before_from_date),
 			"fieldname": "net_asset_value_as_on_from_date",
@@ -520,5 +250,3 @@ def get_columns(filters):
 			"width": 200,
 		},
 	]
-
-	return columns

erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html

@@ -1,3 +1,6 @@
+<div style="margin-bottom: 7px;">
+	{%= frappe.boot.letter_heads[frappe.defaults.get_default("letter_head")] %}
+</div>
 <h2 class="text-center">{%= __("Bank Reconciliation Statement") %}</h2>
 <h4 class="text-center">{%= filters.account && (filters.account + ", "+filters.report_date)  || "" %} {%= filters.company %}</h4>
 <hr>
@@ -43,4 +46,4 @@
 		{% } %}
 	</tbody>
 </table>
-<p class="text-right text-muted">{%= __("Printed on {0}", [frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())]) %}</p>
+<p class="text-right text-muted">Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}</p>

erpnext/accounts/report/financial_statements.html

@@ -67,5 +67,5 @@
 	</tbody>
 </table>
 <p class="text-right text-muted">
-	{%= __("Printed on {0}", [frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())]) %}
+	Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}
 </p>

erpnext/accounts/report/general_ledger/general_ledger.html

@@ -78,4 +78,4 @@
 		{% } %}
 	</tbody>
 </table>
-<p class="text-right text-muted">{%= __("Printed on {0}", [frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())]) %}</p>
+<p class="text-right text-muted">Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}</p>

erpnext/accounts/report/general_ledger/general_ledger.js

@@ -49,14 +49,9 @@ frappe.query_reports["General Ledger"] = {
 			label: __("Voucher No"),
 			fieldtype: "Data",
 			on_change: function () {
-				frappe.query_report.set_filter_value("categorize_by", "Categorize by Voucher (Consolidated)");
+				frappe.query_report.set_filter_value("group_by", "Group by Voucher (Consolidated)");
 			},
 		},
-		{
-			fieldname: "against_voucher_no",
-			label: __("Against Voucher No"),
-			fieldtype: "Data",
-		},
 		{
 			fieldtype: "Break",
 		},
@@ -66,7 +61,7 @@ frappe.query_reports["General Ledger"] = {
 			fieldtype: "Autocomplete",
 			options: Object.keys(frappe.boot.party_account_types),
 			on_change: function () {
-				frappe.query_report.set_filter_value("party", []);
+				frappe.query_report.set_filter_value("party", "");
 			},
 		},
 		{
@@ -112,29 +107,29 @@ frappe.query_reports["General Ledger"] = {
 			hidden: 1,
 		},
 		{
-			fieldname: "categorize_by",
-			label: __("Categorize by"),
+			fieldname: "group_by",
+			label: __("Group by"),
 			fieldtype: "Select",
 			options: [
 				"",
 				{
-					label: __("Categorize by Voucher"),
-					value: "Categorize by Voucher",
+					label: __("Group by Voucher"),
+					value: "Group by Voucher",
 				},
 				{
-					label: __("Categorize by Voucher (Consolidated)"),
-					value: "Categorize by Voucher (Consolidated)",
+					label: __("Group by Voucher (Consolidated)"),
+					value: "Group by Voucher (Consolidated)",
 				},
 				{
-					label: __("Categorize by Account"),
-					value: "Categorize by Account",
+					label: __("Group by Account"),
+					value: "Group by Account",
 				},
 				{
-					label: __("Categorize by Party"),
-					value: "Categorize by Party",
+					label: __("Group by Party"),
+					value: "Group by Party",
 				},
 			],
-			default: "Categorize by Voucher (Consolidated)",
+			default: "Group by Voucher (Consolidated)",
 		},
 		{
 			fieldname: "tax_id",
@@ -197,11 +192,6 @@ frappe.query_reports["General Ledger"] = {
 			label: __("Show Net Values in Party Account"),
 			fieldtype: "Check",
 		},
-		{
-			fieldname: "show_amount_in_company_currency",
-			label: __("Show Credit / Debit in Company Currency"),
-			fieldtype: "Check",
-		},
 		{
 			fieldname: "show_remarks",
 			label: __("Show Remarks"),

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -72,17 +72,13 @@ def validate_filters(filters, account_details):
 			if not account_details.get(account):
 				frappe.throw(_("Account {0} does not exists").format(account))
 
-	if not filters.get("categorize_by") and filters.get("group_by"):
-		filters["categorize_by"] = filters["group_by"]
-		filters["categorize_by"] = filters["categorize_by"].replace("Group by", "Categorize by")
-
-	if filters.get("account") and filters.get("categorize_by") == "Categorize by Account":
+	if filters.get("account") and filters.get("group_by") == "Group by Account":
 		filters.account = frappe.parse_json(filters.get("account"))
 		for account in filters.account:
 			if account_details[account].is_group == 0:
 				frappe.throw(_("Can not filter based on Child Account, if grouped by Account"))
 
-	if filters.get("voucher_no") and filters.get("categorize_by") in ["Categorize by Voucher"]:
+	if filters.get("voucher_no") and filters.get("group_by") in ["Group by Voucher"]:
 		frappe.throw(_("Can not filter based on Voucher No, if grouped by Voucher"))
 
 	if filters.from_date > filters.to_date:
@@ -176,9 +172,9 @@ def get_gl_entries(filters, accounting_dimensions):
 	if filters.get("include_dimensions"):
 		order_by_statement = "order by posting_date, creation"
 
-	if filters.get("categorize_by") == "Categorize by Voucher":
+	if filters.get("group_by") == "Group by Voucher":
 		order_by_statement = "order by posting_date, voucher_type, voucher_no"
-	if filters.get("categorize_by") == "Categorize by Account":
+	if filters.get("group_by") == "Group by Account":
 		order_by_statement = "order by account, posting_date, creation"
 
 	if filters.get("include_default_book_entries"):
@@ -205,7 +201,7 @@ def get_gl_entries(filters, accounting_dimensions):
 	)
 
 	if filters.get("presentation_currency"):
-		return convert_to_presentation_currency(gl_entries, currency_map, filters)
+		return convert_to_presentation_currency(gl_entries, currency_map)
 	else:
 		return gl_entries
 
@@ -229,9 +225,6 @@ def get_conditions(filters):
 	if filters.get("voucher_no"):
 		conditions.append("voucher_no=%(voucher_no)s")
 
-	if filters.get("against_voucher_no"):
-		conditions.append("against_voucher=%(against_voucher_no)s")
-
 	if filters.get("ignore_err"):
 		err_journals = frappe.db.get_all(
 			"Journal Entry",
@@ -265,7 +258,7 @@ def get_conditions(filters):
 	if filters.get("voucher_no_not_in"):
 		conditions.append("voucher_no not in %(voucher_no_not_in)s")
 
-	if filters.get("categorize_by") == "Categorize by Party" and not filters.get("party_type"):
+	if filters.get("group_by") == "Group by Party" and not filters.get("party_type"):
 		conditions.append("party_type in ('Customer', 'Supplier')")
 
 	if filters.get("party_type"):
@@ -277,7 +270,7 @@ def get_conditions(filters):
 	if not (
 		filters.get("account")
 		or filters.get("party")
-		or filters.get("categorize_by") in ["Categorize by Account", "Categorize by Party"]
+		or filters.get("group_by") in ["Group by Account", "Group by Party"]
 	):
 		if not ignore_is_opening:
 			conditions.append("(posting_date >=%(from_date)s or is_opening = 'Yes')")
@@ -372,13 +365,13 @@ def get_data_with_opening_closing(filters, account_details, accounting_dimension
 	# Opening for filtered account
 	data.append(totals.opening)
 
-	if filters.get("categorize_by") != "Categorize by Voucher (Consolidated)":
+	if filters.get("group_by") != "Group by Voucher (Consolidated)":
 		for _acc, acc_dict in gle_map.items():
 			# acc
 			if acc_dict.entries:
 				# opening
 				data.append({})
-				if filters.get("categorize_by") != "Categorize by Voucher":
+				if filters.get("group_by") != "Group by Voucher":
 					data.append(acc_dict.totals.opening)
 
 				data += acc_dict.entries
@@ -387,7 +380,7 @@ def get_data_with_opening_closing(filters, account_details, accounting_dimension
 				data.append(acc_dict.totals.total)
 
 				# closing
-				if filters.get("categorize_by") != "Categorize by Voucher":
+				if filters.get("group_by") != "Group by Voucher":
 					data.append(acc_dict.totals.closing)
 		data.append({})
 	else:
@@ -420,9 +413,9 @@ def get_totals_dict():
 
 
 def group_by_field(group_by):
-	if group_by == "Categorize by Party":
+	if group_by == "Group by Party":
 		return "party"
-	elif group_by in ["Categorize by Voucher (Consolidated)", "Categorize by Account"]:
+	elif group_by in ["Group by Voucher (Consolidated)", "Group by Account"]:
 		return "account"
 	else:
 		return "voucher_no"
@@ -430,7 +423,7 @@ def group_by_field(group_by):
 
 def initialize_gle_map(gl_entries, filters):
 	gle_map = OrderedDict()
-	group_by = group_by_field(filters.get("categorize_by"))
+	group_by = group_by_field(filters.get("group_by"))
 
 	for gle in gl_entries:
 		gle_map.setdefault(gle.get(group_by), _dict(totals=get_totals_dict(), entries=[]))
@@ -441,8 +434,8 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map):
 	totals = get_totals_dict()
 	entries = []
 	consolidated_gle = OrderedDict()
-	group_by = group_by_field(filters.get("categorize_by"))
-	group_by_voucher_consolidated = filters.get("categorize_by") == "Categorize by Voucher (Consolidated)"
+	group_by = group_by_field(filters.get("group_by"))
+	group_by_voucher_consolidated = filters.get("group_by") == "Group by Voucher (Consolidated)"
 
 	if filters.get("show_net_values_in_party_account"):
 		account_type_map = get_account_type_map(filters.get("company"))
@@ -538,20 +531,17 @@ def get_account_type_map(company):
 
 
 def get_result_as_list(data, filters):
-	balance = 0
+	balance, _balance_in_account_currency = 0, 0
 
 	for d in data:
 		if not d.get("posting_date"):
-			balance = 0
+			balance, _balance_in_account_currency = 0, 0
 
 		balance = get_balance(d, balance, "debit", "credit")
-
 		d["balance"] = balance
 
 		d["account_currency"] = filters.account_currency
 
-		d["presentation_currency"] = filters.presentation_currency
-
 	return data
 
 
@@ -577,21 +567,11 @@ def get_columns(filters):
 	if filters.get("presentation_currency"):
 		currency = filters["presentation_currency"]
 	else:
-		company = filters.get("company") or get_default_company()
-		filters["presentation_currency"] = currency = get_company_currency(company)
-
-	company_currency = get_company_currency(filters.get("company") or get_default_company())
-
-	if (
-		filters.get("show_amount_in_company_currency")
-		and filters["presentation_currency"] != company_currency
-	):
-		frappe.throw(
-			_("Presentation Currency cannot be {0} , When {1} is enabled.").format(
-				frappe.bold(filters["presentation_currency"]),
-				frappe.bold("Show Credit / Debit in Company Currency"),
-			)
-		)
+		if filters.get("company"):
+			currency = get_company_currency(filters["company"])
+		else:
+			company = get_default_company()
+			currency = get_company_currency(company)
 
 	columns = [
 		{
@@ -612,22 +592,19 @@ def get_columns(filters):
 		{
 			"label": _("Debit ({0})").format(currency),
 			"fieldname": "debit",
-			"fieldtype": "Currency",
-			"options": "presentation_currency",
+			"fieldtype": "Float",
 			"width": 130,
 		},
 		{
 			"label": _("Credit ({0})").format(currency),
 			"fieldname": "credit",
-			"fieldtype": "Currency",
-			"options": "presentation_currency",
+			"fieldtype": "Float",
 			"width": 130,
 		},
 		{
 			"label": _("Balance ({0})").format(currency),
 			"fieldname": "balance",
-			"fieldtype": "Currency",
-			"options": "presentation_currency",
+			"fieldtype": "Float",
 			"width": 130,
 		},
 		{"label": _("Voucher Type"), "fieldname": "voucher_type", "width": 120},

erpnext/accounts/report/general_ledger/test_general_ledger.py

@@ -155,7 +155,7 @@ class TestGeneralLedger(FrappeTestCase):
 					"from_date": today(),
 					"to_date": today(),
 					"account": [account.name],
-					"categorize_by": "Categorize by Voucher (Consolidated)",
+					"group_by": "Group by Voucher (Consolidated)",
 				}
 			)
 		)
@@ -246,7 +246,7 @@ class TestGeneralLedger(FrappeTestCase):
 					"from_date": today(),
 					"to_date": today(),
 					"account": [account.name],
-					"categorize_by": "Categorize by Voucher (Consolidated)",
+					"group_by": "Group by Voucher (Consolidated)",
 					"ignore_err": True,
 				}
 			)
@@ -261,7 +261,7 @@ class TestGeneralLedger(FrappeTestCase):
 					"from_date": today(),
 					"to_date": today(),
 					"account": [account.name],
-					"categorize_by": "Categorize by Voucher (Consolidated)",
+					"group_by": "Group by Voucher (Consolidated)",
 					"ignore_err": False,
 				}
 			)
@@ -308,7 +308,7 @@ class TestGeneralLedger(FrappeTestCase):
 					"from_date": si.posting_date,
 					"to_date": si.posting_date,
 					"account": [si.debit_to],
-					"categorize_by": "Categorize by Voucher (Consolidated)",
+					"group_by": "Group by Voucher (Consolidated)",
 					"ignore_cr_dr_notes": False,
 				}
 			)
@@ -325,7 +325,7 @@ class TestGeneralLedger(FrappeTestCase):
 					"from_date": si.posting_date,
 					"to_date": si.posting_date,
 					"account": [si.debit_to],
-					"categorize_by": "Categorize by Voucher (Consolidated)",
+					"group_by": "Group by Voucher (Consolidated)",
 					"ignore_cr_dr_notes": True,
 				}
 			)

erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py

@@ -11,7 +11,7 @@ import erpnext
 from erpnext.accounts.report.item_wise_sales_register.item_wise_sales_register import (
 	add_sub_total_row,
 	add_total_row,
-	apply_order_by_conditions,
+	apply_group_by_conditions,
 	get_grand_total,
 	get_group_by_and_display_fields,
 	get_tax_accounts,
@@ -305,6 +305,12 @@ def apply_conditions(query, pi, pii, filters):
 	if filters.get("item_group"):
 		query = query.where(pii.item_group == filters.get("item_group"))
 
+	if not filters.get("group_by"):
+		query = query.orderby(pi.posting_date, order=Order.desc)
+		query = query.orderby(pii.item_group, order=Order.desc)
+	else:
+		query = apply_group_by_conditions(query, pi, pii, filters)
+
 	return query
 
 
@@ -366,17 +372,7 @@ def get_items(filters, additional_table_columns):
 
 	query = apply_conditions(query, pi, pii, filters)
 
-	from frappe.desk.reportview import build_match_conditions
-
-	query, params = query.walk()
-	match_conditions = build_match_conditions(doctype)
-
-	if match_conditions:
-		query += " and " + match_conditions
-
-	query = apply_order_by_conditions(query, pi, pii, filters)
-
-	return frappe.db.sql(query, params, as_dict=True)
+	return query.run(as_dict=True)
 
 
 def get_aii_accounts():

erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py

@@ -384,24 +384,27 @@ def apply_conditions(query, si, sii, filters, additional_conditions=None):
 			| (si.unrealized_profit_loss_account == filters.get("income_account"))
 		)
 
+	if not filters.get("group_by"):
+		query = query.orderby(si.posting_date, order=Order.desc)
+		query = query.orderby(sii.item_group, order=Order.desc)
+	else:
+		query = apply_group_by_conditions(query, si, sii, filters)
+
 	for key, value in (additional_conditions or {}).items():
 		query = query.where(si[key] == value)
 
 	return query
 
 
-def apply_order_by_conditions(query, si, ii, filters):
-	if not filters.get("group_by"):
-		query += f" order by {si.posting_date} desc, {ii.item_group} desc"
-	elif filters.get("group_by") == "Invoice":
-		query += f" order by {ii.parent} desc"
+def apply_group_by_conditions(query, si, ii, filters):
+	if filters.get("group_by") == "Invoice":
+		query = query.orderby(ii.parent, order=Order.desc)
 	elif filters.get("group_by") == "Item":
-		query += f" order by {ii.item_code}"
+		query = query.orderby(ii.item_code)
 	elif filters.get("group_by") == "Item Group":
-		query += f" order by {ii.item_group}"
+		query = query.orderby(ii.item_group)
 	elif filters.get("group_by") in ("Customer", "Customer Group", "Territory", "Supplier"):
-		filter_field = frappe.scrub(filters.get("group_by"))
-		query += f" order by {filter_field} desc"
+		query = query.orderby(si[frappe.scrub(filters.get("group_by"))])
 
 	return query
 
@@ -476,17 +479,7 @@ def get_items(filters, additional_query_columns, additional_conditions=None):
 
 	query = apply_conditions(query, si, sii, filters, additional_conditions)
 
-	from frappe.desk.reportview import build_match_conditions
-
-	query, params = query.walk()
-	match_conditions = build_match_conditions("Sales Invoice")
-
-	if match_conditions:
-		query += " and " + match_conditions
-
-	query = apply_order_by_conditions(query, si, sii, filters)
-
-	return frappe.db.sql(query, params, as_dict=True)
+	return query.run(as_dict=True)
 
 
 def get_delivery_notes_against_sales_order(item_list):

erpnext/accounts/report/payment_ledger/payment_ledger.py

@@ -46,7 +46,6 @@ class PaymentLedger:
 						against_voucher_no=ple.against_voucher_no,
 						amount=ple.amount,
 						currency=ple.account_currency,
-						company=ple.company,
 					)
 
 					if self.filters.include_account_currency:
@@ -78,7 +77,6 @@ class PaymentLedger:
 					against_voucher_no="Outstanding:",
 					amount=total,
 					currency=voucher_data[0].currency,
-					company=voucher_data[0].company,
 				)
 
 				if self.filters.include_account_currency:
@@ -87,12 +85,7 @@ class PaymentLedger:
 				voucher_data.append(entry)
 
 				# empty row
-				voucher_data.append(
-					frappe._dict(
-						currency=voucher_data[0].currency,
-						company=voucher_data[0].company,
-					)
-				)
+				voucher_data.append(frappe._dict())
 				self.data.extend(voucher_data)
 
 	def build_conditions(self):

erpnext/accounts/report/purchase_register/purchase_register.py

@@ -397,6 +397,7 @@ def get_invoices(filters, additional_query_columns):
 			pi.mode_of_payment,
 		)
 		.where(pi.docstatus == 1)
+		.orderby(pi.posting_date, pi.name, order=Order.desc)
 	)
 
 	if additional_query_columns:
@@ -412,17 +413,8 @@ def get_invoices(filters, additional_query_columns):
 		filters, query, doctype="Purchase Invoice", child_doctype="Purchase Invoice Item"
 	)
 
-	from frappe.desk.reportview import build_match_conditions
-
-	query, params = query.walk()
-	match_conditions = build_match_conditions("Purchase Invoice")
-
-	if match_conditions:
-		query += " and " + match_conditions
-
-	query += " order by posting_date desc, name desc"
-
-	return frappe.db.sql(query, params, as_dict=True)
+	invoices = query.run(as_dict=True)
+	return invoices
 
 
 def get_conditions(filters, query, doctype):

erpnext/accounts/report/sales_register/sales_register.py

@@ -438,6 +438,7 @@ def get_invoices(filters, additional_query_columns):
 			si.company,
 		)
 		.where(si.docstatus == 1)
+		.orderby(si.posting_date, si.name, order=Order.desc)
 	)
 
 	if additional_query_columns:
@@ -452,17 +453,8 @@ def get_invoices(filters, additional_query_columns):
 		filters, query, doctype="Sales Invoice", child_doctype="Sales Invoice Item"
 	)
 
-	from frappe.desk.reportview import build_match_conditions
-
-	query, params = query.walk()
-	match_conditions = build_match_conditions("Sales Invoice")
-
-	if match_conditions:
-		query += " and " + match_conditions
-
-	query += " order by posting_date desc, name desc"
-
-	return frappe.db.sql(query, params, as_dict=True)
+	invoices = query.run(as_dict=True)
+	return invoices
 
 
 def get_conditions(filters, query, doctype):

erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py

@@ -4,7 +4,6 @@
 
 import frappe
 from frappe import _
-from frappe.utils import getdate
 
 
 def execute(filters=None):
@@ -34,7 +33,6 @@ def execute(filters=None):
 
 def validate_filters(filters):
 	"""Validate if dates are properly set"""
-	filters = frappe._dict(filters or {})
 	if filters.from_date > filters.to_date:
 		frappe.throw(_("From Date must be before To Date"))
 
@@ -45,7 +43,6 @@ def get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_
 	gle_map = get_gle_map(tds_docs)
 
 	out = []
-	entries = {}
 	for name, details in gle_map.items():
 		for entry in details:
 			tax_amount, total_amount, grand_total, base_total = 0, 0, 0, 0
@@ -71,7 +68,7 @@ def get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_
 				if not tax_withholding_category:
 					tax_withholding_category = party_map.get(party, {}).get("tax_withholding_category")
 
-				rate = get_tax_withholding_rates(tax_rate_map.get(tax_withholding_category, []), posting_date)
+				rate = tax_rate_map.get(tax_withholding_category)
 			if net_total_map.get((voucher_type, name)):
 				if voucher_type == "Journal Entry" and tax_amount and rate:
 					# back calcalute total amount from rate and tax_amount
@@ -120,14 +117,9 @@ def get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_
 						"supplier_invoice_date": bill_date,
 					}
 				)
+				out.append(row)
 
-				key = entry.voucher_no
-				if key in entries:
-					entries[key]["tax_amount"] += tax_amount
-				else:
-					entries[key] = row
-	out = list(entries.values())
-	out.sort(key=lambda x: (x["section_code"], x["transaction_date"]))
+	out.sort(key=lambda x: x["section_code"])
 
 	return out
 
@@ -443,22 +435,12 @@ def get_doc_info(vouchers, doctype, tax_category_map, net_total_map=None):
 def get_tax_rate_map(filters):
 	rate_map = frappe.get_all(
 		"Tax Withholding Rate",
-		filters={"from_date": ("<=", filters.to_date), "to_date": (">=", filters.from_date)},
-		fields=["parent", "tax_withholding_rate", "from_date", "to_date"],
+		filters={
+			"from_date": ("<=", filters.get("from_date")),
+			"to_date": (">=", filters.get("to_date")),
+		},
+		fields=["parent", "tax_withholding_rate"],
+		as_list=1,
 	)
 
-	rate_list = frappe._dict()
-
-	for rate in rate_map:
-		rate_list.setdefault(rate.parent, []).append(frappe._dict(rate))
-
-	return rate_list
-
-
-def get_tax_withholding_rates(tax_withholding, posting_date):
-	# returns the row that matches with the fiscal year from posting date
-	for rate in tax_withholding:
-		if getdate(rate.from_date) <= getdate(posting_date) <= getdate(rate.to_date):
-			return rate.tax_withholding_rate
-
-	return 0
+	return frappe._dict(rate_map)

erpnext/accounts/report/tds_payable_monthly/test_tds_payable_monthly.py

@@ -3,7 +3,7 @@
 
 import frappe
 from frappe.tests.utils import FrappeTestCase
-from frappe.utils import add_to_date, today
+from frappe.utils import today
 
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
@@ -60,58 +60,6 @@ class TestTdsPayableMonthly(AccountsTestMixin, FrappeTestCase):
 		]
 		self.check_expected_values(result, expected_values)
 
-	def test_date_filters_in_multiple_tax_withholding_rules(self):
-		create_tax_category("TDS - 3", rate=10, account="TDS - _TC", cumulative_threshold=1)
-		# insert new rate in same fiscal year
-		fiscal_year = get_fiscal_year(today(), company="_Test Company")
-		mid_year = add_to_date(fiscal_year[1], months=6)
-		tds_doc = frappe.get_doc("Tax Withholding Category", "TDS - 3")
-		tds_doc.rates[0].to_date = mid_year
-		from_date = add_to_date(mid_year, days=1)
-		tds_doc.append(
-			"rates",
-			{
-				"tax_withholding_rate": 20,
-				"from_date": from_date,
-				"to_date": fiscal_year[2],
-				"single_threshold": 1,
-				"cumulative_threshold": 1,
-			},
-		)
-
-		tds_doc.save()
-
-		inv_1 = make_purchase_invoice(
-			rate=1000, posting_date=add_to_date(fiscal_year[1], days=1), do_not_save=True, do_not_submit=True
-		)
-		inv_1.set_posting_time = 1
-		inv_1.apply_tds = 1
-		inv_1.tax_withholding_category = tds_doc.name
-		inv_1.save()
-		inv_1.submit()
-
-		inv_2 = make_purchase_invoice(rate=1000, posting_date=from_date, do_not_save=True, do_not_submit=True)
-		inv_2.set_posting_time = 1
-		inv_2.apply_tds = 1
-		inv_2.tax_withholding_category = tds_doc.name
-		inv_2.save()
-		inv_2.submit()
-
-		result = execute(
-			frappe._dict(
-				company="_Test Company",
-				party_type="Supplier",
-				from_date=fiscal_year[1],
-				to_date=fiscal_year[2],
-			)
-		)[1]
-
-		expected_values = [
-			[inv_1.name, "TDS - 3", 10.0, 5000, 500, 4500],
-			[inv_2.name, "TDS - 3", 20.0, 5000, 1000, 4000],
-		]
-		self.check_expected_values(result, expected_values)
-
 	def check_expected_values(self, result, expected_values):
 		for i in range(len(result)):
 			voucher = frappe._dict(result[i])

erpnext/accounts/report/trial_balance/trial_balance.js

@@ -79,14 +79,8 @@ frappe.require("assets/erpnext/js/financial_statements.js", function () {
 				options: erpnext.get_presentation_currency_list(),
 			},
 			{
-				fieldname: "with_period_closing_entry_for_opening",
-				label: __("With Period Closing Entry For Opening Balances"),
-				fieldtype: "Check",
-				default: 1,
-			},
-			{
-				fieldname: "with_period_closing_entry_for_current_period",
-				label: __("Period Closing Entry For Current Period"),
+				fieldname: "with_period_closing_entry",
+				label: __("Period Closing Entry"),
 				fieldtype: "Check",
 				default: 1,
 			},

erpnext/accounts/report/trial_balance/trial_balance.py

@@ -120,7 +120,7 @@ def get_data(filters):
 		max_rgt,
 		filters,
 		gl_entries_by_account,
-		ignore_closing_entries=not flt(filters.with_period_closing_entry_for_current_period),
+		ignore_closing_entries=not flt(filters.with_period_closing_entry),
 		ignore_opening_entries=True,
 	)
 
@@ -274,7 +274,7 @@ def get_opening_balance(
 	):
 		opening_balance = opening_balance.where(closing_balance.posting_date >= filters.year_start_date)
 
-	if not flt(filters.with_period_closing_entry_for_opening):
+	if not flt(filters.with_period_closing_entry):
 		if doctype == "Account Closing Balance":
 			opening_balance = opening_balance.where(closing_balance.is_period_closing_voucher_entry == 0)
 		else:

erpnext/accounts/report/trial_balance_simple/trial_balance_simple.json

@@ -4,25 +4,15 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "filters": [
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "label": "Company",
-   "mandatory": 1,
-   "options": "Company",
-   "wildcard_filter": 0
-  }
- ],
  "idx": 0, 
  "is_standard": "Yes", 
- "modified": "2025-08-28 19:06:54.273322",
+ "modified": "2019-01-17 17:20:42.374958", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Trial Balance (Simple)", 
  "owner": "Administrator", 
  "prepared_report": 0, 
- "query": "select fiscal_year as \"Fiscal Year:Data:80\",\n\tcompany as \"Company:Data:220\",\n\tposting_date as \"Posting Date:Date:100\",\n\taccount as \"Account:Data:380\",\n\tsum(debit) as \"Debit:Currency:140\",\n\tsum(credit) as \"Credit:Currency:140\",\n\tfinance_book as \"Finance Book:Link/Finance Book:140\"\nfrom `tabGL Entry`\nwhere is_cancelled = 0 and company = %(company)s\ngroup by fiscal_year, company, posting_date, account\norder by fiscal_year, company, posting_date, account",
+ "query": "select fiscal_year as \"Fiscal Year:Data:80\",\n\tcompany as \"Company:Data:220\",\n\tposting_date as \"Posting Date:Date:100\",\n\taccount as \"Account:Data:380\",\n\tsum(debit) as \"Debit:Currency:140\",\n\tsum(credit) as \"Credit:Currency:140\",\n\tfinance_book as \"Finance Book:Link/Finance Book:140\"\nfrom `tabGL Entry`\ngroup by fiscal_year, company, posting_date, account\norder by fiscal_year, company, posting_date, account", 
  "ref_doctype": "GL Entry", 
  "report_name": "Trial Balance (Simple)", 
  "report_type": "Query Report", 

erpnext/accounts/report/utils.py

@@ -86,7 +86,7 @@ def get_rate_as_at(date, from_currency, to_currency):
 	return rate
 
 
-def convert_to_presentation_currency(gl_entries, currency_info, filters=None):
+def convert_to_presentation_currency(gl_entries, currency_info):
 	"""
 	Take a list of GL Entries and change the 'debit' and 'credit' values to currencies
 	in `currency_info`.
@@ -99,13 +99,6 @@ def convert_to_presentation_currency(gl_entries, currency_info, filters=None):
 	company_currency = currency_info["company_currency"]
 
 	account_currencies = list(set(entry["account_currency"] for entry in gl_entries))
-	exchange_gain_or_loss = False
-
-	if filters and isinstance(filters.get("account"), list):
-		account_filter = filters.get("account")
-		gain_loss_account = frappe.db.get_value("Company", filters.company, "exchange_gain_loss_account")
-
-		exchange_gain_or_loss = len(account_filter) == 1 and account_filter[0] == gain_loss_account
 
 	for entry in gl_entries:
 		debit = flt(entry["debit"])
@@ -114,11 +107,7 @@ def convert_to_presentation_currency(gl_entries, currency_info, filters=None):
 		credit_in_account_currency = flt(entry["credit_in_account_currency"])
 		account_currency = entry["account_currency"]
 
-		if (
-			len(account_currencies) == 1
-			and account_currency == presentation_currency
-			and not exchange_gain_or_loss
-		) and not (filters and filters.get("show_amount_in_company_currency")):
+		if len(account_currencies) == 1 and account_currency == presentation_currency:
 			entry["debit"] = debit_in_account_currency
 			entry["credit"] = credit_in_account_currency
 		else:

erpnext/accounts/test/test_reports.py

@@ -12,8 +12,8 @@ DEFAULT_FILTERS = {
 
 
 REPORT_FILTER_TEST_CASES: list[tuple[ReportName, ReportFilters]] = [
-	("General Ledger", {"categorize_by": "Categorize by Voucher (Consolidated)"}),
-	("General Ledger", {"categorize_by": "Categorize by Voucher (Consolidated)", "include_dimensions": 1}),
+	("General Ledger", {"group_by": "Group by Voucher (Consolidated)"}),
+	("General Ledger", {"group_by": "Group by Voucher (Consolidated)", "include_dimensions": 1}),
 	("Accounts Payable", {"range1": 30, "range2": 60, "range3": 90, "range4": 120}),
 	("Accounts Receivable", {"range1": 30, "range2": 60, "range3": 90, "range4": 120}),
 	("Consolidated Financial Statement", {"report": "Balance Sheet"}),

erpnext/accounts/utils.py

@@ -2,14 +2,12 @@
 # License: GNU General Public License v3. See license.txt
 
 
-from collections import defaultdict
 from json import loads
 from typing import TYPE_CHECKING, Optional
 
 import frappe
 import frappe.defaults
 from frappe import _, qb, throw
-from frappe.desk.reportview import build_match_conditions
 from frappe.model.meta import get_field_precision
 from frappe.query_builder import AliasedQuery, Criterion, Table
 from frappe.query_builder.functions import Round, Sum
@@ -28,7 +26,6 @@ from frappe.utils import (
 	nowdate,
 )
 from pypika import Order
-from pypika.functions import Coalesce
 from pypika.terms import ExistsCriterion
 
 import erpnext
@@ -1791,17 +1788,14 @@ def update_voucher_outstanding(voucher_type, voucher_no, account, party_type, pa
 	):
 		outstanding = voucher_outstanding[0]
 		ref_doc = frappe.get_doc(voucher_type, voucher_no)
-		outstanding_amount = flt(
-			outstanding["outstanding_in_account_currency"], ref_doc.precision("outstanding_amount")
-		)
 
 		# Didn't use db_set for optimisation purpose
-		ref_doc.outstanding_amount = outstanding_amount
+		ref_doc.outstanding_amount = outstanding["outstanding_in_account_currency"] or 0.0
 		frappe.db.set_value(
 			voucher_type,
 			voucher_no,
 			"outstanding_amount",
-			outstanding_amount,
+			outstanding["outstanding_in_account_currency"] or 0.0,
 		)
 
 		ref_doc.set_status(update=True)
@@ -2194,44 +2188,3 @@ def run_ledger_health_checks():
 					doc.general_and_payment_ledger_mismatch = True
 					doc.checked_on = run_date
 					doc.save()
-
-
-def get_link_fields_grouped_by_option(doctype):
-	meta = frappe.get_meta(doctype)
-	link_fields_map = defaultdict(list)
-
-	for df in meta.fields:
-		if df.fieldtype == "Link" and df.options and not df.ignore_user_permissions:
-			link_fields_map[df.options].append(df.fieldname)
-
-	return link_fields_map
-
-
-def build_qb_match_conditions(doctype, user=None) -> list:
-	match_filters = build_match_conditions(doctype, user, False)
-	link_fields_map = get_link_fields_grouped_by_option(doctype)
-	criterion = []
-	apply_strict_user_permissions = frappe.get_system_settings("apply_strict_user_permissions")
-
-	if match_filters:
-		_dt = qb.DocType(doctype)
-
-		for filter in match_filters:
-			for link_option, allowed_values in filter.items():
-				fieldnames = link_fields_map.get(link_option, [])
-				cond = None
-
-				if link_option == doctype:
-					cond = _dt["name"].isin(allowed_values)
-
-				for fieldname in fieldnames:
-					field = _dt[fieldname]
-					cond = field.isin(allowed_values)
-
-					if not apply_strict_user_permissions:
-						cond = (Coalesce(field, "") == "") | cond
-
-				if cond:
-					criterion.append(cond)
-
-	return criterion

erpnext/assets/doctype/asset/asset.json

@@ -152,7 +152,6 @@
   {
    "allow_on_submit": 1,
    "fetch_from": "item_code.image",
-   "fetch_if_empty": 1,
    "fieldname": "image",
    "fieldtype": "Attach Image",
    "hidden": 1,
@@ -583,7 +582,7 @@
    "link_fieldname": "target_asset"
   }
  ],
- "modified": "2025-05-20 00:44:06.229177",
+ "modified": "2024-01-15 17:35:49.226603",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset",

erpnext/assets/doctype/asset/asset.py

@@ -313,7 +313,6 @@ class Asset(AccountsController):
 				"asset_name": self.asset_name,
 				"target_location": self.location,
 				"to_employee": self.custodian,
-				"company": self.company,
 			}
 		]
 		asset_movement = frappe.get_doc(
@@ -636,44 +635,38 @@ class Asset(AccountsController):
 		return add_days(self.available_for_use_date, -1)
 
 	# if it returns True, depreciation_amount will not be equal for the first and last rows
-	def check_is_pro_rata(asset_doc, row, wdv_or_dd_non_yearly=False):
+	def check_is_pro_rata(self, row, wdv_or_dd_non_yearly=False):
 		has_pro_rata = False
 
 		# if not existing asset, from_date = available_for_use_date
 		# otherwise, if number_of_depreciations_booked = 2, available_for_use_date = 01/01/2020 and frequency_of_depreciation = 12
 		# from_date = 01/01/2022
-		if row.depreciation_method in ("Straight Line", "Manual"):
-			prev_depreciation_start_date = get_last_day(
-				add_months(
-					row.depreciation_start_date,
-					(row.frequency_of_depreciation * -1) * asset_doc.number_of_depreciations_booked,
-				)
-			)
-			from_date = asset_doc.available_for_use_date
-			days = date_diff(prev_depreciation_start_date, from_date) + 1
-			total_days = get_total_days(prev_depreciation_start_date, row.frequency_of_depreciation)
-		else:
-			from_date = _get_modified_available_for_use_date(asset_doc, row, wdv_or_dd_non_yearly=False)
-			days = date_diff(row.depreciation_start_date, from_date) + 1
-			total_days = get_total_days(row.depreciation_start_date, row.frequency_of_depreciation)
+		from_date = self.get_modified_available_for_use_date(row, wdv_or_dd_non_yearly)
+		days = date_diff(row.depreciation_start_date, from_date) + 1
 
-		if days <= 0:
-			frappe.throw(
-				_(
-					"""Error: This asset already has {0} depreciation periods booked.
-					The `depreciation start` date must be at least {1} periods after the `available for use` date.
-					Please correct the dates accordingly."""
-				).format(
-					asset_doc.number_of_depreciations_booked,
-					asset_doc.number_of_depreciations_booked,
-				)
-			)
+		if wdv_or_dd_non_yearly:
+			total_days = get_total_days(row.depreciation_start_date, 12)
+		else:
+			# if frequency_of_depreciation is 12 months, total_days = 365
+			total_days = get_total_days(row.depreciation_start_date, row.frequency_of_depreciation)
 
 		if days < total_days:
 			has_pro_rata = True
 
 		return has_pro_rata
 
+	def get_modified_available_for_use_date(self, row, wdv_or_dd_non_yearly=False):
+		if wdv_or_dd_non_yearly:
+			return add_months(
+				self.available_for_use_date,
+				(self.number_of_depreciations_booked * 12),
+			)
+		else:
+			return add_months(
+				self.available_for_use_date,
+				(self.number_of_depreciations_booked * row.frequency_of_depreciation),
+			)
+
 	def validate_asset_finance_books(self, row):
 		if flt(row.expected_value_after_useful_life) >= flt(self.gross_purchase_amount):
 			frappe.throw(
@@ -1297,28 +1290,6 @@ def get_item_details(item_code, asset_category, gross_purchase_amount):
 	return books
 
 
-def _get_modified_available_for_use_date(asset_doc, row, wdv_or_dd_non_yearly=False):
-	"""
-	if Asset has opening booked depreciations = 9,
-	available for use date = 17-07-2023,
-	depreciation start date = 30-04-2024
-	then from date should be 01-04-2024
-	"""
-	if asset_doc.number_of_depreciations_booked > 0:
-		from_date = add_months(
-			asset_doc.available_for_use_date,
-			(asset_doc.number_of_depreciations_booked * row.frequency_of_depreciation) - 1,
-		)
-		if is_last_day_of_the_month(row.depreciation_start_date):
-			return add_days(get_last_day(from_date), 1)
-
-		# get from date when depreciation start date is not last day of the month
-		months_difference = month_diff(row.depreciation_start_date, from_date) - 1
-		return add_days(add_months(row.depreciation_start_date, -1 * months_difference), 1)
-	else:
-		return asset_doc.available_for_use_date
-
-
 def get_asset_account(account_name, asset=None, asset_category=None, company=None):
 	account = None
 	if asset:
@@ -1532,7 +1503,11 @@ def get_straight_line_or_manual_depr_amount(asset, row, schedule_idx, number_of_
 	# if the Depreciation Schedule is being prepared for the first time
 	else:
 		if row.daily_prorata_based:
-			amount = flt(asset.gross_purchase_amount) - flt(row.expected_value_after_useful_life)
+			amount = (
+				flt(asset.gross_purchase_amount)
+				- flt(asset.opening_accumulated_depreciation)
+				- flt(row.expected_value_after_useful_life)
+			)
 			total_days = (
 				date_diff(
 					get_last_day(
@@ -1544,11 +1519,7 @@ def get_straight_line_or_manual_depr_amount(asset, row, schedule_idx, number_of_
 					),
 					add_days(
 						get_last_day(
-							add_months(
-								row.depreciation_start_date,
-								(row.frequency_of_depreciation * (asset.number_of_depreciations_booked + 1))
-								* -1,
-							),
+							add_months(row.depreciation_start_date, -1 * row.frequency_of_depreciation)
 						),
 						1,
 					),
@@ -1571,9 +1542,11 @@ def get_straight_line_or_manual_depr_amount(asset, row, schedule_idx, number_of_
 
 			return daily_depr_amount * (date_diff(to_date, from_date) + 1)
 		else:
-			return (flt(asset.gross_purchase_amount) - flt(row.expected_value_after_useful_life)) / flt(
-				row.total_number_of_depreciations
-			)
+			return (
+				flt(asset.gross_purchase_amount)
+				- flt(asset.opening_accumulated_depreciation)
+				- flt(row.expected_value_after_useful_life)
+			) / flt(row.total_number_of_depreciations - asset.number_of_depreciations_booked)
 
 
 def get_shift_depr_amount(asset, row, schedule_idx):

erpnext/assets/doctype/asset/test_asset.py

@@ -660,7 +660,7 @@ class TestDepreciationMethods(AssetSetup):
 			available_for_use_date="2030-06-06",
 			is_existing_asset=1,
 			number_of_depreciations_booked=2,
-			opening_accumulated_depreciation=47178.08,
+			opening_accumulated_depreciation=47095.89,
 			expected_value_after_useful_life=10000,
 			depreciation_start_date="2032-12-31",
 			total_number_of_depreciations=3,
@@ -668,7 +668,7 @@ class TestDepreciationMethods(AssetSetup):
 		)
 
 		self.assertEqual(asset.status, "Draft")
-		expected_schedules = [["2032-12-31", 30000.0, 77178.08], ["2033-06-06", 12821.92, 90000.0]]
+		expected_schedules = [["2032-12-31", 42904.11, 90000.0]]
 		schedules = [
 			[cstr(d.schedule_date), flt(d.depreciation_amount, 2), d.accumulated_depreciation_amount]
 			for d in asset.get("schedules")
@@ -1451,7 +1451,7 @@ class TestDepreciationBasics(AssetSetup):
 		affects `value_after_depreciation`
 		"""
 
-		asset = create_asset(calculate_depreciation=1, depreciation_start_date="2021-12-31")
+		asset = create_asset(calculate_depreciation=1)
 		asset.opening_accumulated_depreciation = 2000
 		asset.number_of_depreciations_booked = 1
 

erpnext/assets/doctype/asset_capitalization/asset_capitalization.js

@@ -380,7 +380,7 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
 					args: {
 						item_code: item.item_code,
 						warehouse: cstr(item.warehouse),
-						qty: -1 * flt(item.stock_qty),
+						qty: flt(item.stock_qty),
 						serial_no: item.serial_no,
 						posting_date: me.frm.doc.posting_date,
 						posting_time: me.frm.doc.posting_time,

erpnext/assets/doctype/asset_repair/asset_repair.json

@@ -76,7 +76,6 @@
    "fieldname": "completion_date",
    "fieldtype": "Datetime",
    "label": "Completion Date",
-   "mandatory_depends_on": "eval:doc.repair_status==\"Completed\"",
    "no_copy": 1
   },
   {
@@ -265,7 +264,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2025-07-29 15:14:34.044564",
+ "modified": "2022-08-16 15:55:25.023471",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Repair",
@@ -303,11 +302,10 @@
    "write": 1
   }
  ],
- "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
  "title_field": "asset_name",
  "track_changes": 1,
  "track_seen": 1
-}
+}

erpnext/assets/doctype/asset_repair/asset_repair.py

@@ -3,7 +3,7 @@
 
 import frappe
 from frappe import _
-from frappe.utils import add_months, cint, flt, get_link_to_form, getdate, time_diff_in_hours
+from frappe.utils import add_months, cint, flt, getdate, time_diff_in_hours
 
 import erpnext
 from erpnext.accounts.general_ledger import make_gl_entries
@@ -20,20 +20,6 @@ class AssetRepair(AccountsController):
 			self.set_stock_items_cost()
 		self.calculate_total_repair_cost()
 
-	def validate_asset(self):
-		if self.asset_doc.status in ("Sold", "Fully Depreciated", "Scrapped"):
-			frappe.throw(
-				_("Asset {0} is in {1} status and cannot be repaired.").format(
-					get_link_to_form("Asset", self.asset), self.asset_doc.status
-				)
-			)
-
-	def validate_dates(self):
-		if self.completion_date and (getdate(self.failure_date) > getdate(self.completion_date)):
-			frappe.throw(
-				_("Completion Date can not be before Failure Date. Please adjust the dates accordingly.")
-			)
-
 	def update_status(self):
 		if self.repair_status == "Pending":
 			frappe.db.set_value("Asset", self.asset, "status", "Out of Order")
@@ -209,7 +195,7 @@ class AssetRepair(AccountsController):
 					"voucher_type": self.doctype,
 					"voucher_no": self.name,
 					"cost_center": self.cost_center,
-					"posting_date": self.completion_date,
+					"posting_date": getdate(),
 					"against_voucher_type": "Purchase Invoice",
 					"against_voucher": self.purchase_invoice,
 					"company": self.company,
@@ -228,7 +214,7 @@ class AssetRepair(AccountsController):
 					"voucher_type": self.doctype,
 					"voucher_no": self.name,
 					"cost_center": self.cost_center,
-					"posting_date": self.completion_date,
+					"posting_date": getdate(),
 					"company": self.company,
 				},
 				item=self,
@@ -262,7 +248,7 @@ class AssetRepair(AccountsController):
 							"voucher_type": self.doctype,
 							"voucher_no": self.name,
 							"cost_center": self.cost_center,
-							"posting_date": self.completion_date,
+							"posting_date": getdate(),
 							"company": self.company,
 						},
 						item=self,
@@ -279,7 +265,7 @@ class AssetRepair(AccountsController):
 							"voucher_type": self.doctype,
 							"voucher_no": self.name,
 							"cost_center": self.cost_center,
-							"posting_date": self.completion_date,
+							"posting_date": getdate(),
 							"against_voucher_type": "Stock Entry",
 							"against_voucher": self.stock_entry,
 							"company": self.company,

erpnext/assets/doctype/asset_repair/test_asset_repair.py

@@ -4,7 +4,7 @@
 import unittest
 
 import frappe
-from frappe.utils import add_days, flt, nowdate
+from frappe.utils import flt, nowdate
 
 from erpnext.assets.doctype.asset.asset import (
 	get_asset_account,
@@ -288,7 +288,6 @@ def create_asset_repair(**args):
 
 	if args.submit:
 		asset_repair.repair_status = "Completed"
-		asset_repair.completion_date = add_days(args.failure_date, 1)
 		asset_repair.cost_center = frappe.db.get_value("Company", asset.company, "cost_center")
 
 		if args.stock_consumption:

erpnext/buying/doctype/purchase_order/purchase_order.py

@@ -456,8 +456,9 @@ class PurchaseOrder(BuyingController):
 		if not self.is_against_so():
 			return
 		for item in removed_items:
-			prev_ordered_qty = flt(
+			prev_ordered_qty = (
 				frappe.get_cached_value("Sales Order Item", item.get("sales_order_item"), "ordered_qty")
+				or 0.0
 			)
 
 			frappe.db.set_value(

erpnext/buying/doctype/purchase_order/test_purchase_order.py

@@ -526,8 +526,12 @@ class TestPurchaseOrder(FrappeTestCase):
 		self.assertRaises(frappe.ValidationError, pr.submit)
 		self.assertRaises(frappe.ValidationError, pi.submit)
 
-	@change_settings("Accounts Settings", {"automatically_fetch_payment_terms": 1})
 	def test_make_purchase_invoice_with_terms(self):
+		from erpnext.selling.doctype.sales_order.test_sales_order import (
+			automatically_fetch_payment_terms,
+		)
+
+		automatically_fetch_payment_terms()
 		po = create_purchase_order(do_not_save=True)
 
 		self.assertRaises(frappe.ValidationError, make_pi_from_po, po.name)
@@ -551,6 +555,7 @@ class TestPurchaseOrder(FrappeTestCase):
 		self.assertEqual(getdate(pi.payment_schedule[0].due_date), getdate(po.transaction_date))
 		self.assertEqual(pi.payment_schedule[1].payment_amount, 2500.0)
 		self.assertEqual(getdate(pi.payment_schedule[1].due_date), add_days(getdate(po.transaction_date), 30))
+		automatically_fetch_payment_terms(enable=0)
 
 	def test_warehouse_company_validation(self):
 		from erpnext.stock.utils import InvalidWarehouseCompany
@@ -698,7 +703,6 @@ class TestPurchaseOrder(FrappeTestCase):
 		)
 		self.assertEqual(due_date, "2023-03-31")
 
-	@change_settings("Accounts Settings", {"automatically_fetch_payment_terms": 0})
 	def test_terms_are_not_copied_if_automatically_fetch_payment_terms_is_unchecked(self):
 		po = create_purchase_order(do_not_save=1)
 		po.payment_terms_template = "_Test Payment Term Template"
@@ -830,16 +834,18 @@ class TestPurchaseOrder(FrappeTestCase):
 		bo.load_from_db()
 		self.assertEqual(bo.items[0].ordered_qty, 5)
 
-	@change_settings("Accounts Settings", {"automatically_fetch_payment_terms": 1})
 	def test_payment_terms_are_fetched_when_creating_purchase_invoice(self):
 		from erpnext.accounts.doctype.payment_entry.test_payment_entry import (
 			create_payment_terms_template,
 		)
 		from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 		from erpnext.selling.doctype.sales_order.test_sales_order import (
+			automatically_fetch_payment_terms,
 			compare_payment_schedules,
 		)
 
+		automatically_fetch_payment_terms()
+
 		po = create_purchase_order(qty=10, rate=100, do_not_save=1)
 		create_payment_terms_template()
 		po.payment_terms_template = "Test Receivable Template"
@@ -853,6 +859,8 @@ class TestPurchaseOrder(FrappeTestCase):
 		# self.assertEqual(po.payment_terms_template, pi.payment_terms_template)
 		compare_payment_schedules(self, po, pi)
 
+		automatically_fetch_payment_terms(enable=0)
+
 	def test_internal_transfer_flow(self):
 		from erpnext.accounts.doctype.sales_invoice.sales_invoice import (
 			make_inter_company_purchase_invoice,

erpnext/buying/doctype/request_for_quotation/request_for_quotation.py

@@ -9,7 +9,6 @@ from frappe import _
 from frappe.core.doctype.communication.email import make
 from frappe.desk.form.load import get_attachments
 from frappe.model.mapper import get_mapped_doc
-from frappe.query_builder import Order
 from frappe.utils import get_url
 from frappe.utils.print_format import download_pdf
 from frappe.utils.user import get_user_fullname
@@ -503,32 +502,35 @@ def get_supplier_tag():
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
 def get_rfq_containing_supplier(doctype, txt, searchfield, start, page_len, filters):
-	rfq = frappe.qb.DocType("Request for Quotation")
-	rfq_supplier = frappe.qb.DocType("Request for Quotation Supplier")
-
-	query = (
-		frappe.qb.from_(rfq)
-		.from_(rfq_supplier)
-		.select(rfq.name)
-		.distinct()
-		.select(rfq.transaction_date, rfq.company)
-		.where(
-			(rfq.name == rfq_supplier.parent)
-			& (rfq_supplier.supplier == filters.get("supplier"))
-			& (rfq.docstatus == 1)
-			& (rfq.company == filters.get("company"))
-		)
-		.orderby(rfq.transaction_date, order=Order.asc)
-		.limit(page_len)
-		.offset(start)
-	)
-
+	conditions = ""
 	if txt:
-		query = query.where(rfq.name.like(f"%%{txt}%%"))
+		conditions += "and rfq.name like '%%" + txt + "%%' "
 
 	if filters.get("transaction_date"):
-		query = query.where(rfq.transaction_date == filters.get("transaction_date"))
+		conditions += "and rfq.transaction_date = '{}'".format(filters.get("transaction_date"))
 
-	rfq_data = query.run(as_dict=1)
+	rfq_data = frappe.db.sql(
+		f"""
+		select
+			distinct rfq.name, rfq.transaction_date,
+			rfq.company
+		from
+			`tabRequest for Quotation` rfq, `tabRequest for Quotation Supplier` rfq_supplier
+		where
+			rfq.name = rfq_supplier.parent
+			and rfq_supplier.supplier = %(supplier)s
+			and rfq.docstatus = 1
+			and rfq.company = %(company)s
+			{conditions}
+		order by rfq.transaction_date ASC
+		limit %(page_len)s offset %(start)s """,
+		{
+			"page_len": page_len,
+			"start": start,
+			"company": filters.get("company"),
+			"supplier": filters.get("supplier"),
+		},
+		as_dict=1,
+	)
 
 	return rfq_data

erpnext/buying/doctype/supplier/supplier.js

@@ -42,11 +42,6 @@ frappe.ui.form.on("Supplier", {
 				},
 			};
 		});
-
-		frm.make_methods = {
-			"Bank Account": () => erpnext.utils.make_bank_account(frm.doc.doctype, frm.doc.name),
-			"Pricing Rule": () => erpnext.utils.make_pricing_rule(frm.doc.doctype, frm.doc.name),
-		};
 	},
 
 	refresh: function (frm) {
@@ -89,9 +84,21 @@ frappe.ui.form.on("Supplier", {
 				__("View")
 			);
 
-			frm.add_custom_button(__("Bank Account"), () => frm.make_methods["Bank Account"](), __("Create"));
+			frm.add_custom_button(
+				__("Bank Account"),
+				function () {
+					erpnext.utils.make_bank_account(frm.doc.doctype, frm.doc.name);
+				},
+				__("Create")
+			);
 
-			frm.add_custom_button(__("Pricing Rule"), () => frm.make_methods["Pricing Rule"](), __("Create"));
+			frm.add_custom_button(
+				__("Pricing Rule"),
+				function () {
+					erpnext.utils.make_pricing_rule(frm.doc.doctype, frm.doc.name);
+				},
+				__("Create")
+			);
 
 			frm.add_custom_button(
 				__("Get Supplier Group Details"),
@@ -101,10 +108,7 @@ frappe.ui.form.on("Supplier", {
 				__("Actions")
 			);
 
-			if (
-				cint(frappe.defaults.get_default("enable_common_party_accounting")) &&
-				frappe.model.can_create("Party Link")
-			) {
+			if (cint(frappe.defaults.get_default("enable_common_party_accounting"))) {
 				frm.add_custom_button(
 					__("Link with Customer"),
 					function () {

erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html

@@ -94,6 +94,9 @@
     </script>
 
  </head>
+<div style="margin-bottom: 7px;" class="text-center">
+	{%= frappe.boot.letter_heads[frappe.defaults.get_default("letter_head")] %}
+</div>
 <h2 class="text-center">{%= __(report.report_name) %}</h2>
 <h4 class="text-center">{%= filters.item %} </h4>
 
@@ -121,7 +124,9 @@
 	</tbody>
 </table>
 
-<h4 class="text-center">{%= __("Analysis Chart") %}</h4>
+<h4 class="text-center"> Analysis Chart </h4>
 <div id="chart_div"></div>
 
-<p class="text-right text-muted">{%= __("Printed on {0}", [frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())]) %}</p>
+
+
+<p class="text-right text-muted">Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}</p>

erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js

@@ -76,14 +76,14 @@ frappe.query_reports["Supplier Quotation Comparison"] = {
 			},
 		},
 		{
-			fieldname: "categorize_by",
-			label: __("Categorize by"),
+			fieldname: "group_by",
+			label: __("Group by"),
 			fieldtype: "Select",
 			options: [
-				{ label: __("Categorize by Supplier"), value: "Categorize by Supplier" },
-				{ label: __("Categorize by Item"), value: "Categorize by Item" },
+				{ label: __("Group by Supplier"), value: "Group by Supplier" },
+				{ label: __("Group by Item"), value: "Group by Item" },
 			],
-			default: __("Categorize by Supplier"),
+			default: __("Group by Supplier"),
 		},
 		{
 			fieldtype: "Check",

erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py

@@ -15,8 +15,6 @@ def execute(filters=None):
 	if not filters:
 		return [], []
 
-	validate_filters(filters)
-
 	columns = get_columns(filters)
 	supplier_quotation_data = get_data(filters)
 
@@ -26,12 +24,6 @@ def execute(filters=None):
 	return columns, data, message, chart_data
 
 
-def validate_filters(filters):
-	if not filters.get("categorize_by") and filters.get("group_by"):
-		filters["categorize_by"] = filters["group_by"]
-		filters["categorize_by"] = filters["categorize_by"].replace("Group by", "Categorize by")
-
-
 def get_data(filters):
 	sq = frappe.qb.DocType("Supplier Quotation")
 	sq_item = frappe.qb.DocType("Supplier Quotation Item")
@@ -90,9 +82,7 @@ def prepare_data(supplier_quotation_data, filters):
 	group_wise_map = defaultdict(list)
 	supplier_qty_price_map = {}
 
-	group_by_field = (
-		"supplier_name" if filters.get("categorize_by") == "Categorize by Supplier" else "item_code"
-	)
+	group_by_field = "supplier_name" if filters.get("group_by") == "Group by Supplier" else "item_code"
 	company_currency = frappe.db.get_default("currency")
 	float_precision = cint(frappe.db.get_default("float_precision")) or 2
 
@@ -284,7 +274,7 @@ def get_columns(filters):
 		},
 	]
 
-	if filters.get("categorize_by") == "Categorize by Item":
+	if filters.get("group_by") == "Group by Item":
 		group_by_columns.reverse()
 
 	columns[0:0] = group_by_columns  # add positioned group by columns to the report

erpnext/buying/utils.py

@@ -20,9 +20,6 @@ def update_last_purchase_rate(doc, is_submit) -> None:
 	this_purchase_date = getdate(doc.get("posting_date") or doc.get("transaction_date"))
 
 	for d in doc.get("items"):
-		if d.get("is_free_item"):
-			continue
-
 		# get last purchase details
 		last_purchase_details = get_last_purchase_details(d.item_code, doc.name)
 

erpnext/change_log/v14/v14_92_13.md

@@ -1,11 +0,0 @@
-# End of Life reached
-
-With the release of ERPNext version 16, version 14 has reached its end of life.
-
-This means that version 14 of ERPNext (which is running on this site) will no longer receive critical bug fixes and is no longer covered under Frappe Support.
-
-We highly recommend that you update to version 16 to get the latest bug fixes, features and other improvements.
-
-[Click here to know more about version 16](https://frappe.io/erpnext/version-16)
-
-If you're on [Frappe Cloud](https://frappe.io/cloud), [click here to learn how to update to v16](https://docs.frappe.io/cloud/sites/version-upgrade)

erpnext/controllers/accounts_controller.py

@@ -153,48 +153,6 @@ class AccountsController(TransactionBase):
 						raise_exception=1,
 					)
 
-	def validate_against_voucher_outstanding(self):
-		from frappe.model.meta import get_meta
-
-		if not get_meta(self.doctype).has_field("outstanding_amount"):
-			return
-
-		if self.get("is_return") and self.return_against and not self.get("is_pos"):
-			against_voucher_outstanding = frappe.get_value(
-				self.doctype, self.return_against, "outstanding_amount"
-			)
-			document_type = "Credit Note" if self.doctype == "Sales Invoice" else "Debit Note"
-
-			msg = ""
-			if self.get("update_outstanding_for_self"):
-				msg = (
-					"We can see {0} is made against {1}. If you want {1}'s outstanding to be updated, "
-					"uncheck '{2}' checkbox. <br><br>Or"
-				).format(
-					frappe.bold(document_type),
-					get_link_to_form(self.doctype, self.get("return_against")),
-					frappe.bold(_("Update Outstanding for Self")),
-				)
-
-			elif not self.update_outstanding_for_self and (
-				abs(flt(self.rounded_total) or flt(self.grand_total)) > flt(against_voucher_outstanding)
-			):
-				self.update_outstanding_for_self = 1
-				msg = (
-					"The outstanding amount {} in {} is lesser than {}. Updating the outstanding to this invoice. <br><br>And"
-				).format(
-					against_voucher_outstanding,
-					get_link_to_form(self.doctype, self.get("return_against")),
-					flt(abs(self.outstanding_amount)),
-				)
-
-			if msg:
-				msg += " you can use {} tool to reconcile against {} later.".format(
-					get_link_to_form("Payment Reconciliation", "Payment Reconciliation"),
-					get_link_to_form(self.doctype, self.get("return_against")),
-				)
-				frappe.msgprint(_(msg))
-
 	def validate(self):
 		if not self.get("is_return") and not self.get("is_debit_note"):
 			self.validate_qty_is_not_zero()
@@ -213,11 +171,6 @@ class AccountsController(TransactionBase):
 
 		self.validate_date_with_fiscal_year()
 		self.validate_party_accounts()
-		if self.doctype in ["Sales Invoice", "Purchase Invoice"]:
-			if self.is_return:
-				self.validate_qty()
-			else:
-				self.validate_deferred_start_and_end_date()
 
 		self.validate_inter_company_reference()
 
@@ -225,7 +178,6 @@ class AccountsController(TransactionBase):
 		self.disable_tax_included_prices_for_internal_transfer()
 		self.set_incoming_rate()
 		self.init_internal_values()
-		self.validate_against_voucher_outstanding()
 
 		if self.meta.get_field("currency"):
 			self.calculate_taxes_and_totals()
@@ -257,12 +209,31 @@ class AccountsController(TransactionBase):
 					)
 				)
 
+			if self.get("is_return") and self.get("return_against") and not self.get("is_pos"):
+				if self.get("update_outstanding_for_self"):
+					document_type = "Credit Note" if self.doctype == "Sales Invoice" else "Debit Note"
+					frappe.msgprint(
+						_(
+							"We can see {0} is made against {1}. If you want {1}'s outstanding to be updated, uncheck '{2}' checkbox. <br><br> Or you can use {3} tool to reconcile against {1} later."
+						).format(
+							frappe.bold(document_type),
+							get_link_to_form(self.doctype, self.get("return_against")),
+							frappe.bold("Update Outstanding for Self"),
+							get_link_to_form("Payment Reconciliation", "Payment Reconciliation"),
+						)
+					)
+
 			pos_check_field = "is_pos" if self.doctype == "Sales Invoice" else "is_paid"
 			if cint(self.allocate_advances_automatically) and not cint(self.get(pos_check_field)):
 				self.set_advances()
 
 			self.set_advance_gain_or_loss()
 
+			if self.is_return:
+				self.validate_qty()
+			else:
+				self.validate_deferred_start_and_end_date()
+
 			self.validate_deferred_income_expense_account()
 			self.set_inter_company_account()
 
@@ -684,9 +655,7 @@ class AccountsController(TransactionBase):
 				"Customer",
 				self.customer,
 				self.company,
-				None,
 				self.payment_terms_template,
-				self.doctype,
 			)
 		elif self.doctype == "Purchase Invoice":
 			validate_due_date(
@@ -697,7 +666,6 @@ class AccountsController(TransactionBase):
 				self.company,
 				self.bill_date,
 				self.payment_terms_template,
-				self.doctype,
 			)
 
 	def set_price_list_currency(self, buying_or_selling):
@@ -1742,50 +1710,69 @@ class AccountsController(TransactionBase):
 	def validate_multiple_billing(self, ref_dt, item_ref_dn, based_on):
 		from erpnext.controllers.status_updater import get_allowance_for
 
-		ref_wise_billed_amount = self.get_reference_wise_billed_amt(ref_dt, item_ref_dn, based_on)
+		item_allowance = {}
+		global_qty_allowance, global_amount_allowance = None, None
 
-		if not ref_wise_billed_amount:
-			return
-
-		total_overbilled_amt = 0.0
-		overbilled_items = []
-		precision = self.precision(based_on, "items")
-		precision_allowance = 1 / (10**precision)
-
-		role_allowed_to_overbill = frappe.get_cached_value(
+		role_allowed_to_over_bill = frappe.get_cached_value(
 			"Accounts Settings", None, "role_allowed_to_over_bill"
 		)
-		is_overbilling_allowed = role_allowed_to_overbill in frappe.get_roles()
+		user_roles = frappe.get_roles()
 
-		for row in ref_wise_billed_amount.values():
-			total_billed_amt = row.billed_amt
-			allowance = get_allowance_for(row.item_code, {}, None, None, "amount")[0]
+		total_overbilled_amt = 0.0
 
-			max_allowed_amt = flt(row.ref_amt * (100 + allowance) / 100)
+		reference_names = [d.get(item_ref_dn) for d in self.get("items") if d.get(item_ref_dn)]
+		reference_details = self.get_billing_reference_details(reference_names, ref_dt + " Item", based_on)
+
+		for item in self.get("items"):
+			if not item.get(item_ref_dn):
+				continue
+
+			ref_amt = flt(reference_details.get(item.get(item_ref_dn)), self.precision(based_on, item))
+			based_on_amt = flt(item.get(based_on))
+
+			if not ref_amt:
+				if based_on_amt:  # Skip warning for free items
+					frappe.msgprint(
+						_(
+							"System will not check over billing since amount for Item {0} in {1} is zero"
+						).format(item.item_code, ref_dt),
+						title=_("Warning"),
+						indicator="orange",
+					)
+				continue
+
+			already_billed = self.get_billed_amount_for_item(item, item_ref_dn, based_on)
+
+			total_billed_amt = flt(flt(already_billed) + based_on_amt, self.precision(based_on, item))
+
+			allowance, item_allowance, global_qty_allowance, global_amount_allowance = get_allowance_for(
+				item.item_code, item_allowance, global_qty_allowance, global_amount_allowance, "amount"
+			)
+
+			max_allowed_amt = flt(ref_amt * (100 + allowance) / 100)
 
 			if total_billed_amt < 0 and max_allowed_amt < 0:
 				# while making debit note against purchase return entry(purchase receipt) getting overbill error
-				total_billed_amt, max_allowed_amt = abs(total_billed_amt), abs(max_allowed_amt)
+				total_billed_amt = abs(total_billed_amt)
+				max_allowed_amt = abs(max_allowed_amt)
 
 			overbill_amt = total_billed_amt - max_allowed_amt
-			row["max_allowed_amt"] = max_allowed_amt
 			total_overbilled_amt += overbill_amt
 
-			if overbill_amt > precision_allowance and not is_overbilling_allowed:
-				if self.doctype != "Purchase Invoice" or not cint(
+			if overbill_amt > 0.01 and role_allowed_to_over_bill not in user_roles:
+				if self.doctype != "Purchase Invoice":
+					self.throw_overbill_exception(item, max_allowed_amt)
+				elif not cint(
 					frappe.db.get_single_value(
 						"Buying Settings", "bill_for_rejected_quantity_in_purchase_invoice"
 					)
 				):
-					overbilled_items.append(row)
+					self.throw_overbill_exception(item, max_allowed_amt)
 
-		if overbilled_items:
-			self.throw_overbill_exception(overbilled_items, precision)
-
-		if is_overbilling_allowed and total_overbilled_amt > 0.1:
+		if role_allowed_to_over_bill in user_roles and total_overbilled_amt > 0.1:
 			frappe.msgprint(
 				_("Overbilling of {} ignored because you have {} role.").format(
-					total_overbilled_amt, role_allowed_to_overbill
+					total_overbilled_amt, role_allowed_to_over_bill
 				),
 				indicator="orange",
 				alert=True,
@@ -1801,87 +1788,54 @@ class AccountsController(TransactionBase):
 			)
 		)
 
-	def get_reference_wise_billed_amt(self, ref_dt, item_ref_dn, based_on):
+	def get_billed_amount_for_item(self, item, item_ref_dn, based_on):
 		"""
 		Returns Sum of Amount of
 		Sales/Purchase Invoice Items
 		that are linked to `item_ref_dn` (`dn_detail` / `pr_detail`)
 		that are submitted OR not submitted but are under current invoice
 		"""
-		reference_names = [d.get(item_ref_dn) for d in self.items if d.get(item_ref_dn)]
 
-		if not reference_names:
-			return
+		from frappe.query_builder import Criterion
+		from frappe.query_builder.functions import Sum
 
-		ref_wise_billed_amount = {}
-		precision = self.precision(based_on, "items")
-		reference_details = self.get_billing_reference_details(reference_names, ref_dt + " Item", based_on)
-		already_billed = self.get_already_billed_amount(reference_names, item_ref_dn, based_on)
-
-		for item in self.items:
-			key = item.get(item_ref_dn)
-			if not key:
-				continue
-
-			ref_amt = flt(reference_details.get(key), precision)
-			current_amount = flt(item.get(based_on), precision)
-
-			if not ref_amt:
-				if current_amount:  # Skip warning for free items
-					frappe.msgprint(
-						_(
-							"System will not check over billing since amount for Item {0} in {1} is zero"
-						).format(item.item_code, ref_dt),
-						title=_("Warning"),
-						indicator="orange",
-					)
-				continue
-
-			ref_wise_billed_amount.setdefault(
-				key,
-				frappe._dict(item_code=item.item_code, billed_amt=0.0, ref_amt=ref_amt, rows=[]),
-			)
-
-			ref_wise_billed_amount[key]["rows"].append(item.idx)
-			ref_wise_billed_amount[key]["ref_amt"] = ref_amt
-			ref_wise_billed_amount[key]["billed_amt"] += current_amount
-			if key in already_billed:
-				ref_wise_billed_amount[key]["billed_amt"] += flt(already_billed.pop(key, 0), precision)
-
-		return ref_wise_billed_amount
-
-	def get_already_billed_amount(self, reference_names, item_ref_dn, based_on):
-		item_doctype = frappe.qb.DocType(self.items[0].doctype)
+		item_doctype = frappe.qb.DocType(item.doctype)
 		based_on_field = frappe.qb.Field(based_on)
 		join_field = frappe.qb.Field(item_ref_dn)
 
-		return frappe._dict(
-			(
-				frappe.qb.from_(item_doctype)
-				.select(join_field, Sum(based_on_field))
-				.where(join_field.isin(reference_names))
-				.where((item_doctype.docstatus == 1) & (item_doctype.parent != self.name))
-				.groupby(join_field)
-			).run()
-		)
-
-	def throw_overbill_exception(self, overbilled_items, precision):
-		message = (
-			_("<p>Cannot overbill for the following Items:</p>")
-			+ "<ul>"
-			+ "".join(
-				_("<li>Item {0} in row(s) {1} billed more than {2}</li>").format(
-					frappe.bold(item.item_code),
-					", ".join(str(x) for x in item.rows),
-					frappe.bold(fmt_money(item.max_allowed_amt, precision=precision, currency=self.currency)),
+		result = (
+			frappe.qb.from_(item_doctype)
+			.select(Sum(based_on_field))
+			.where(join_field == item.get(item_ref_dn))
+			.where(
+				Criterion.any(
+					[  # select all items from other invoices OR current invoices
+						Criterion.all(
+							[  # for selecting items from other invoices
+								item_doctype.docstatus == 1,
+								item_doctype.parent != self.name,
+							]
+						),
+						Criterion.all(
+							[  # for selecting items from current invoice, that are linked to same reference
+								item_doctype.docstatus == 0,
+								item_doctype.parent == self.name,
+								item_doctype.name != item.name,
+							]
+						),
+					]
 				)
-				for item in overbilled_items
 			)
-			+ "</ul>"
-		)
-		message += _("<p>To allow over-billing, please set allowance in Accounts Settings.</p>")
+		).run()
 
-		frappe.throw(_(message))
+		return result[0][0] if result else 0
+
+	def throw_overbill_exception(self, item, max_allowed_amt):
+		frappe.throw(
+			_(
+				"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings"
+			).format(item.item_code, item.idx, max_allowed_amt)
+		)
 
 	def get_company_default(self, fieldname, ignore_validation=False):
 		from erpnext.accounts.utils import get_company_default
@@ -2146,9 +2100,7 @@ class AccountsController(TransactionBase):
 				and automatically_fetch_payment_terms
 				and self.linked_order_has_payment_terms(po_or_so, fieldname, doctype)
 			):
-				self.fetch_payment_terms_from_order(
-					po_or_so, doctype, grand_total, base_grand_total, automatically_fetch_payment_terms
-				)
+				self.fetch_payment_terms_from_order(po_or_so, doctype)
 				if self.get("payment_terms_template"):
 					self.ignore_default_payment_terms_template = 1
 			elif self.get("payment_terms_template"):
@@ -2189,9 +2141,7 @@ class AccountsController(TransactionBase):
 						d.payment_amount * self.get("conversion_rate"), d.precision("base_payment_amount")
 					)
 		else:
-			self.fetch_payment_terms_from_order(
-				po_or_so, doctype, grand_total, base_grand_total, automatically_fetch_payment_terms
-			)
+			self.fetch_payment_terms_from_order(po_or_so, doctype)
 			self.ignore_default_payment_terms_template = 1
 
 	def get_order_details(self):
@@ -2229,9 +2179,7 @@ class AccountsController(TransactionBase):
 	def linked_order_has_payment_schedule(self, po_or_so):
 		return frappe.get_all("Payment Schedule", filters={"parent": po_or_so})
 
-	def fetch_payment_terms_from_order(
-		self, po_or_so, po_or_so_doctype, grand_total, base_grand_total, automatically_fetch_payment_terms
-	):
+	def fetch_payment_terms_from_order(self, po_or_so, po_or_so_doctype):
 		"""
 		Fetch Payment Terms from Purchase/Sales Order on creating a new Purchase/Sales Invoice.
 		"""
@@ -2239,7 +2187,6 @@ class AccountsController(TransactionBase):
 
 		self.payment_schedule = []
 		self.payment_terms_template = po_or_so.payment_terms_template
-		posting_date = self.get("bill_date") or self.get("posting_date") or self.get("transaction_date")
 
 		for schedule in po_or_so.payment_schedule:
 			payment_schedule = {
@@ -2248,36 +2195,12 @@ class AccountsController(TransactionBase):
 				"invoice_portion": schedule.invoice_portion,
 				"mode_of_payment": schedule.mode_of_payment,
 				"description": schedule.description,
+				"payment_amount": schedule.payment_amount,
+				"base_payment_amount": schedule.base_payment_amount,
+				"outstanding": schedule.outstanding,
 				"paid_amount": schedule.paid_amount,
 			}
 
-			if automatically_fetch_payment_terms:
-				if schedule.due_date_based_on:
-					payment_schedule["due_date"] = get_due_date(schedule, posting_date)
-					payment_schedule["due_date_based_on"] = schedule.due_date_based_on
-					payment_schedule["credit_days"] = cint(schedule.credit_days)
-					payment_schedule["credit_months"] = cint(schedule.credit_months)
-
-				if schedule.discount_validity_based_on:
-					payment_schedule["discount_date"] = get_discount_date(schedule, posting_date)
-					payment_schedule["discount_validity_based_on"] = schedule.discount_validity_based_on
-					payment_schedule["discount_validity"] = cint(schedule.discount_validity)
-
-				payment_schedule["payment_amount"] = flt(
-					grand_total * flt(payment_schedule["invoice_portion"]) / 100,
-					schedule.precision("payment_amount"),
-				)
-				payment_schedule["base_payment_amount"] = flt(
-					base_grand_total * flt(payment_schedule["invoice_portion"]) / 100,
-					schedule.precision("base_payment_amount"),
-				)
-				payment_schedule["outstanding"] = payment_schedule["payment_amount"]
-			else:
-				payment_schedule["base_payment_amount"] = flt(
-					schedule.base_payment_amount * self.get("conversion_rate"),
-					schedule.precision("base_payment_amount"),
-				)
-
 			if schedule.discount_type == "Percentage":
 				payment_schedule["discount_type"] = schedule.discount_type
 				payment_schedule["discount"] = schedule.discount
@@ -2750,7 +2673,9 @@ def set_balance_in_account_currency(
 			_("Account: {0} with currency: {1} can not be selected").format(gl_dict.account, account_currency)
 		)
 
-	gl_dict["account_currency"] = account_currency
+	gl_dict["account_currency"] = (
+		company_currency if account_currency == company_currency else account_currency
+	)
 
 	# set debit/credit in account currency if not provided
 	if flt(gl_dict.debit) and not flt(gl_dict.debit_in_account_currency):
@@ -2997,26 +2922,14 @@ def get_payment_term_details(
 		term = frappe.get_doc("Payment Term", term)
 	else:
 		term_details.payment_term = term.payment_term
-
-	fields_to_copy = [
-		"description",
-		"invoice_portion",
-		"discount_type",
-		"discount",
-		"mode_of_payment",
-		"due_date_based_on",
-		"credit_days",
-		"credit_months",
-		"discount_validity_based_on",
-		"discount_validity",
-	]
-
-	for field in fields_to_copy:
-		term_details[field] = term.get(field)
-
+	term_details.description = term.description
+	term_details.invoice_portion = term.invoice_portion
 	term_details.payment_amount = flt(term.invoice_portion) * flt(grand_total) / 100
 	term_details.base_payment_amount = flt(term.invoice_portion) * flt(base_grand_total) / 100
+	term_details.discount_type = term.discount_type
+	term_details.discount = term.discount
 	term_details.outstanding = term_details.payment_amount
+	term_details.mode_of_payment = term.mode_of_payment
 
 	if bill_date:
 		term_details.due_date = get_due_date(term, bill_date)
@@ -3035,11 +2948,11 @@ def get_due_date(term, posting_date=None, bill_date=None):
 	due_date = None
 	date = bill_date or posting_date
 	if term.due_date_based_on == "Day(s) after invoice date":
-		due_date = add_days(date, cint(term.credit_days))
+		due_date = add_days(date, term.credit_days)
 	elif term.due_date_based_on == "Day(s) after the end of the invoice month":
-		due_date = add_days(get_last_day(date), cint(term.credit_days))
+		due_date = add_days(get_last_day(date), term.credit_days)
 	elif term.due_date_based_on == "Month(s) after the end of the invoice month":
-		due_date = get_last_day(add_months(date, cint(term.credit_months)))
+		due_date = get_last_day(add_months(date, term.credit_months))
 	return due_date
 
 
@@ -3047,11 +2960,11 @@ def get_discount_date(term, posting_date=None, bill_date=None):
 	discount_validity = None
 	date = bill_date or posting_date
 	if term.discount_validity_based_on == "Day(s) after invoice date":
-		discount_validity = add_days(date, cint(term.discount_validity))
+		discount_validity = add_days(date, term.discount_validity)
 	elif term.discount_validity_based_on == "Day(s) after the end of the invoice month":
-		discount_validity = add_days(get_last_day(date), cint(term.discount_validity))
+		discount_validity = add_days(get_last_day(date), term.discount_validity)
 	elif term.discount_validity_based_on == "Month(s) after the end of the invoice month":
-		discount_validity = get_last_day(add_months(date, cint(term.discount_validity)))
+		discount_validity = get_last_day(add_months(date, term.discount_validity))
 	return discount_validity
 
 

erpnext/controllers/queries.py

@@ -6,7 +6,7 @@ import json
 from collections import defaultdict
 
 import frappe
-from frappe import cint, qb, scrub
+from frappe import qb, scrub
 from frappe.desk.reportview import get_filters_cond, get_match_cond
 from frappe.query_builder import Criterion, CustomFunction
 from frappe.query_builder.functions import Locate
@@ -528,27 +528,21 @@ def get_account_list(doctype, txt, searchfield, start, page_len, filters):
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
 def get_blanket_orders(doctype, txt, searchfield, start, page_len, filters):
-	bo = frappe.qb.DocType("Blanket Order")
-	bo_item = frappe.qb.DocType("Blanket Order Item")
-
-	blanket_orders = (
-		frappe.qb.from_(bo)
-		.from_(bo_item)
-		.select(bo.name)
-		.distinct()
-		.select(bo.blanket_order_type, bo.to_date)
-		.where(
-			(bo_item.parent == bo.name)
-			& (bo_item.item_code == filters.get("item"))
-			& (bo.blanket_order_type == filters.get("blanket_order_type"))
-			& (bo.company == filters.get("company"))
-			& (bo.docstatus == 1)
+	return frappe.db.sql(
+		"""select distinct bo.name, bo.blanket_order_type, bo.to_date
+		from `tabBlanket Order` bo, `tabBlanket Order Item` boi
+		where
+			boi.parent = bo.name
+			and boi.item_code = {item_code}
+			and bo.blanket_order_type = '{blanket_order_type}'
+			and bo.company = {company}
+			and bo.docstatus = 1""".format(
+			item_code=frappe.db.escape(filters.get("item")),
+			blanket_order_type=filters.get("blanket_order_type"),
+			company=frappe.db.escape(filters.get("company")),
 		)
-		.run()
 	)
 
-	return blanket_orders
-
 
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
@@ -566,7 +560,7 @@ def get_income_account(doctype, txt, searchfield, start, page_len, filters):
 	if filters.get("company"):
 		condition += "and tabAccount.company = %(company)s"
 
-	condition += " and tabAccount.disabled = %(disabled)s"
+	condition += f"and tabAccount.disabled = {filters.get('disabled', 0)}"
 
 	return frappe.db.sql(
 		f"""select tabAccount.name from `tabAccount`
@@ -576,11 +570,7 @@ def get_income_account(doctype, txt, searchfield, start, page_len, filters):
 				and tabAccount.`{searchfield}` LIKE %(txt)s
 				{condition} {get_match_cond(doctype)}
 			order by idx desc, name""",
-		{
-			"txt": "%" + txt + "%",
-			"company": filters.get("company", ""),
-			"disabled": cint(filters.get("disabled", 0)),
-		},
+		{"txt": "%" + txt + "%", "company": filters.get("company", "")},
 	)
 
 
@@ -656,7 +646,7 @@ def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
 		where (tabAccount.report_type = "Profit and Loss"
 				or tabAccount.account_type in ("Expense Account", "Fixed Asset", "Temporary", "Asset Received But Not Billed", "Capital Work in Progress"))
 			and tabAccount.is_group=0
-		    and tabAccount.disabled = 0
+			and tabAccount.docstatus!=2
 			and tabAccount.{searchfield} LIKE %(txt)s
 			{condition} {get_match_cond(doctype)}""",
 		{"company": filters.get("company", ""), "txt": "%" + txt + "%"},

erpnext/controllers/sales_and_purchase_return.py

@@ -368,7 +368,7 @@ def make_return_doc(doctype: str, source_name: str, target_doc=None):
 
 	from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
 
-	company = frappe.db.get_value(doctype, source_name, "company")
+	company = frappe.db.get_value("Delivery Note", source_name, "company")
 	default_warehouse_for_sales_return = frappe.get_cached_value(
 		"Company", company, "default_warehouse_for_sales_return"
 	)

erpnext/controllers/selling_controller.py

@@ -728,16 +728,7 @@ class SellingController(StockController):
 
 
 def set_default_income_account_for_item(obj):
-	"""Set income account as default for items in the transaction.
-
-	Updates the item default income account for each item in the transaction
-	if it differs from the company's default income account.
-
-	Args:
-	    obj: Transaction document containing items table with income_account field
-	"""
-	company_default = frappe.get_cached_value("Company", obj.company, "default_income_account")
-	for d in obj.get("items", default=[]):
-		income_account = getattr(d, "income_account", None)
-		if d.item_code and income_account and income_account != company_default:
-			set_item_default(d.item_code, obj.company, "income_account", income_account)
+	for d in obj.get("items"):
+		if d.item_code:
+			if getattr(d, "income_account", None):
+				set_item_default(d.item_code, obj.company, "income_account", d.income_account)

erpnext/controllers/stock_controller.py

@@ -520,9 +520,8 @@ class StockController(AccountsController):
 
 		make_sl_entries(sl_entries, allow_negative_stock, via_landed_cost_voucher)
 
-	def make_gl_entries_on_cancel(self, from_repost=False):
-		if not from_repost:
-			cancel_exchange_gain_loss_journal(frappe._dict(doctype=self.doctype, name=self.name))
+	def make_gl_entries_on_cancel(self):
+		cancel_exchange_gain_loss_journal(frappe._dict(doctype=self.doctype, name=self.name))
 		if frappe.db.sql(
 			"""select name from `tabGL Entry` where voucher_type=%s
 			and voucher_no=%s""",
@@ -1028,7 +1027,12 @@ def is_reposting_pending():
 	)
 
 
-def future_sle_exists(args, sl_entries=None):
+def future_sle_exists(args, sl_entries=None, allow_force_reposting=True):
+	if allow_force_reposting and frappe.db.get_single_value(
+		"Stock Reposting Settings", "do_reposting_for_each_stock_transaction"
+	):
+		return True
+
 	key = (args.voucher_type, args.voucher_no)
 	if not hasattr(frappe.local, "future_sle"):
 		frappe.local.future_sle = {}

erpnext/controllers/taxes_and_totals.py

@@ -42,23 +42,17 @@ class calculate_taxes_and_totals:
 		items = list(filter(lambda item: not item.get("is_alternative"), self.doc.get("items")))
 		return items
 
-	def calculate(self, ignore_tax_template_validation=False):
+	def calculate(self):
 		if not len(self._items):
 			return
 
 		self.discount_amount_applied = False
-		self.need_recomputation = False
-		self.ignore_tax_template_validation = ignore_tax_template_validation
-
 		self._calculate()
 
 		if self.doc.meta.get_field("discount_amount"):
 			self.set_discount_amount()
 			self.apply_discount_amount()
 
-		if not ignore_tax_template_validation and self.need_recomputation:
-			return self.calculate(ignore_tax_template_validation=True)
-
 		# Update grand total as per cash and non trade discount
 		if self.doc.apply_discount_on == "Grand Total" and self.doc.get("is_cash_or_non_trade_discount"):
 			self.doc.grand_total -= self.doc.discount_amount
@@ -102,9 +96,6 @@ class calculate_taxes_and_totals:
 			self.doc.base_tax_withholding_net_total = sum_base_net_amount
 
 	def validate_item_tax_template(self):
-		if self.ignore_tax_template_validation:
-			return
-
 		if self.doc.get("is_return") and self.doc.get("return_against"):
 			return
 
@@ -145,10 +136,6 @@ class calculate_taxes_and_totals:
 							)
 						)
 
-						# For correct tax_amount calculation re-computation is required
-						if self.discount_amount_applied and self.doc.apply_discount_on == "Grand Total":
-							self.need_recomputation = True
-
 	def update_item_tax_map(self):
 		for item in self.doc.items:
 			item.item_tax_rate = get_item_tax_map(
@@ -386,7 +373,9 @@ class calculate_taxes_and_totals:
 			self._calculate()
 
 	def calculate_taxes(self):
-		self.grand_total_diff = 0
+		rounding_adjustment_computed = self.doc.get("is_consolidated") and self.doc.get("rounding_adjustment")
+		if not rounding_adjustment_computed:
+			self.doc.rounding_adjustment = 0
 
 		# maintain actual tax rate based on idx
 		actual_tax_dict = dict(
@@ -451,8 +440,9 @@ class calculate_taxes_and_totals:
 						and self.discount_amount_applied
 						and self.doc.discount_amount
 						and self.doc.apply_discount_on == "Grand Total"
+						and not rounding_adjustment_computed
 					):
-						self.grand_total_diff = flt(
+						self.doc.rounding_adjustment = flt(
 							self.doc.grand_total - flt(self.doc.discount_amount) - tax.total,
 							self.doc.precision("rounding_adjustment"),
 						)
@@ -538,11 +528,11 @@ class calculate_taxes_and_totals:
 		return self.adjust_grand_total_for_inclusive_tax()
 
 	def adjust_grand_total_for_inclusive_tax(self):
-		# if any inclusive taxes and diff
+		# if fully inclusive taxes and diff
 		if self.doc.get("taxes") and any(cint(t.included_in_print_rate) for t in self.doc.get("taxes")):
 			last_tax = self.doc.get("taxes")[-1]
 			non_inclusive_tax_amount = sum(
-				self.get_tax_amount_if_for_valuation_or_deduction(d.tax_amount_after_discount_amount, d)
+				flt(d.tax_amount_after_discount_amount)
 				for d in self.doc.get("taxes")
 				if not d.included_in_print_rate
 			)
@@ -559,23 +549,27 @@ class calculate_taxes_and_totals:
 			diff = flt(diff, self.doc.precision("rounding_adjustment"))
 
 			if diff and abs(diff) <= (5.0 / 10 ** last_tax.precision("tax_amount")):
-				self.grand_total_diff = diff
+				self.doc.grand_total_diff = diff
+			else:
+				self.doc.grand_total_diff = 0
 
 	def calculate_totals(self):
 		if self.doc.get("taxes"):
-			self.doc.grand_total = flt(self.doc.get("taxes")[-1].total) + self.grand_total_diff
+			self.doc.grand_total = flt(self.doc.get("taxes")[-1].total) + flt(
+				self.doc.get("grand_total_diff")
+			)
 		else:
 			self.doc.grand_total = flt(self.doc.net_total)
 
 		if self.doc.get("taxes"):
 			self.doc.total_taxes_and_charges = flt(
-				self.doc.grand_total - self.doc.net_total - self.grand_total_diff,
+				self.doc.grand_total - self.doc.net_total - flt(self.doc.get("grand_total_diff")),
 				self.doc.precision("total_taxes_and_charges"),
 			)
 		else:
 			self.doc.total_taxes_and_charges = 0.0
 
-		self._set_in_company_currency(self.doc, ["total_taxes_and_charges"])
+		self._set_in_company_currency(self.doc, ["total_taxes_and_charges", "rounding_adjustment"])
 
 		if self.doc.doctype in [
 			"Quotation",
@@ -625,9 +619,7 @@ class calculate_taxes_and_totals:
 
 		if self.doc.meta.get_field("rounded_total"):
 			if self.doc.is_rounded_total_disabled():
-				self.doc.rounded_total = 0
-				self.doc.base_rounded_total = 0
-				self.doc.rounding_adjustment = 0
+				self.doc.rounded_total = self.doc.base_rounded_total = 0
 				return
 
 			self.doc.rounded_total = round_based_on_smallest_currency_fraction(
@@ -671,29 +663,33 @@ class calculate_taxes_and_totals:
 				return
 
 			total_for_discount_amount = self.get_total_for_discount_amount()
+			taxes = self.doc.get("taxes")
 			net_total = 0
-			expected_net_total = 0
 
 			if total_for_discount_amount:
 				# calculate item amount after Discount Amount
-				for item in self._items:
+				for i, item in enumerate(self._items):
 					distributed_amount = (
 						flt(self.doc.discount_amount) * item.net_amount / total_for_discount_amount
 					)
 
-					adjusted_net_amount = item.net_amount - distributed_amount
-					expected_net_total += adjusted_net_amount
-					item.net_amount = flt(adjusted_net_amount, item.precision("net_amount"))
+					item.net_amount = flt(item.net_amount - distributed_amount, item.precision("net_amount"))
 					net_total += item.net_amount
 
-					# discount amount rounding adjustment
-					if rounding_difference := flt(
-						expected_net_total - net_total, self.doc.precision("net_total")
-					):
-						item.net_amount = flt(
-							item.net_amount + rounding_difference, item.precision("net_amount")
+					# discount amount rounding loss adjustment if no taxes
+					if (
+						self.doc.apply_discount_on == "Net Total"
+						or not taxes
+						or total_for_discount_amount == self.doc.net_total
+					) and i == len(self._items) - 1:
+						discount_amount_loss = flt(
+							self.doc.net_total - net_total - self.doc.discount_amount,
+							self.doc.precision("net_total"),
+						)
+
+						item.net_amount = flt(
+							item.net_amount + discount_amount_loss, item.precision("net_amount")
 						)
-						net_total += rounding_difference
 
 					item.net_rate = (
 						flt(item.net_amount / item.qty, item.precision("net_rate")) if item.qty else 0
@@ -709,44 +705,20 @@ class calculate_taxes_and_totals:
 	def get_total_for_discount_amount(self):
 		if self.doc.apply_discount_on == "Net Total":
 			return self.doc.net_total
+		else:
+			actual_taxes_dict = {}
 
-		total_actual_tax = 0
-		actual_taxes_dict = {}
+			for tax in self.doc.get("taxes"):
+				if tax.charge_type in ["Actual", "On Item Quantity"]:
+					tax_amount = self.get_tax_amount_if_for_valuation_or_deduction(tax.tax_amount, tax)
+					actual_taxes_dict.setdefault(tax.idx, tax_amount)
+				elif tax.row_id in actual_taxes_dict:
+					actual_tax_amount = flt(actual_taxes_dict.get(tax.row_id, 0)) * flt(tax.rate) / 100
+					actual_taxes_dict.setdefault(tax.idx, actual_tax_amount)
 
-		def update_actual_tax_dict(tax, tax_amount):
-			nonlocal total_actual_tax
-
-			if tax.get("add_deduct_tax") == "Deduct":
-				tax_amount *= -1
-
-			if tax.get("category") != "Valuation":
-				total_actual_tax += tax_amount
-
-			actual_taxes_dict[int(tax.idx)] = {
-				"tax_amount": tax_amount,
-				"cumulative_tax_amount": total_actual_tax,
-			}
-
-		for tax in self.doc.get("taxes"):
-			if tax.charge_type in ["Actual", "On Item Quantity"]:
-				update_actual_tax_dict(tax, tax.tax_amount)
-				continue
-
-			if not tax.row_id:
-				continue
-
-			base_row = actual_taxes_dict.get(int(tax.row_id))
-			if not base_row:
-				continue
-
-			base_tax_amount = (
-				base_row["tax_amount"]
-				if tax.charge_type == "On Previous Row Amount"
-				else base_row["cumulative_tax_amount"]
+			return flt(
+				self.doc.grand_total - sum(actual_taxes_dict.values()), self.doc.precision("grand_total")
 			)
-			update_actual_tax_dict(tax, base_tax_amount * tax.rate / 100)
-
-		return self.doc.grand_total - total_actual_tax
 
 	def calculate_total_advance(self):
 		if not self.doc.docstatus.is_cancelled():
@@ -808,12 +780,9 @@ class calculate_taxes_and_totals:
 		if (
 			self.doc.is_return
 			and self.doc.return_against
-			and not self.doc.update_outstanding_for_self
 			and not self.doc.get("is_pos")
 			or self.is_internal_invoice()
 		):
-			# Do not calculate the outstanding amount for a return invoice if 'update_outstanding_for_self' is not enabled.
-			self.doc.outstanding_amount = 0
 			return
 
 		self.doc.round_floats_in(self.doc, ["grand_total", "total_advance", "write_off_amount"])

erpnext/crm/doctype/contract/contract.js

@@ -29,10 +29,4 @@ frappe.ui.form.on("Contract", {
 			});
 		}
 	},
-	party_name: function (frm) {
-		let field = frm.doc.party_type.toLowerCase() + "_name";
-		frappe.db.get_value(frm.doc.party_type, frm.doc.party_name, field, (r) => {
-			frm.set_value("party_full_name", r[field]);
-		});
-	},
 });

erpnext/crm/doctype/contract/contract.json

@@ -14,7 +14,6 @@
   "party_user",
   "status",
   "fulfilment_status",
-  "party_full_name",
   "sb_terms",
   "start_date",
   "cb_date",
@@ -245,18 +244,11 @@
    "fieldname": "authorised_by_section",
    "fieldtype": "Section Break",
    "label": "Authorised By"
-  },
-  {
-   "fieldname": "party_full_name",
-   "fieldtype": "Data",
-   "label": "Party Full Name",
-   "read_only": 1
   }
  ],
- "grid_page_length": 50,
  "is_submittable": 1,
  "links": [],
- "modified": "2025-05-23 13:54:03.346537",
+ "modified": "2020-12-07 11:15:58.385521",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Contract",
@@ -323,10 +315,9 @@
    "write": 1
   }
  ],
- "row_format": "Dynamic",
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1,
  "track_seen": 1
-}
+}

erpnext/crm/doctype/contract/contract.py

@@ -23,17 +23,10 @@ class Contract(Document):
 		self.name = _(name)
 
 	def validate(self):
-		self.set_missing_values()
 		self.validate_dates()
 		self.update_contract_status()
 		self.update_fulfilment_status()
 
-	def set_missing_values(self):
-		if not self.party_full_name:
-			field = self.party_type.lower() + "_name"
-			if res := frappe.db.get_value(self.party_type, self.party_name, field):
-				self.party_full_name = res
-
 	def before_submit(self):
 		self.signed_by_company = frappe.session.user
 

erpnext/edi/doctype/code_list/code_list_import.py

@@ -60,7 +60,7 @@ def import_genericode():
 			"doctype": "File",
 			"attached_to_doctype": "Code List",
 			"attached_to_name": code_list.name,
-			"folder": frappe.db.get_value("File", {"is_attachments_folder": 1}),
+			"folder": "Home/Attachments",
 			"file_name": frappe.local.uploaded_filename,
 			"file_url": frappe.local.uploaded_file_url,
 			"is_private": 1,

erpnext/edi/doctype/common_code/common_code.json

@@ -6,7 +6,6 @@
  "engine": "InnoDB",
  "field_order": [
   "code_list",
-  "canonical_uri",
   "title",
   "common_code",
   "description",
@@ -72,17 +71,10 @@
    "in_list_view": 1,
    "label": "Description",
    "max_height": "60px"
-  },
-  {
-   "fetch_from": "code_list.canonical_uri",
-   "fieldname": "canonical_uri",
-   "fieldtype": "Data",
-   "label": "Canonical URI"
   }
  ],
- "grid_page_length": 50,
  "links": [],
- "modified": "2025-10-04 17:22:28.176155",
+ "modified": "2024-11-06 07:46:17.175687",
  "modified_by": "Administrator",
  "module": "EDI",
  "name": "Common Code",
@@ -102,11 +94,10 @@
    "write": 1
   }
  ],
- "row_format": "Dynamic",
  "search_fields": "common_code,description",
  "show_title_field_in_link": 1,
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "title"
-}
+}

erpnext/edi/doctype/common_code/common_code.py

@@ -22,7 +22,6 @@ class CommonCode(Document):
 
 		additional_data: DF.Code | None
 		applies_to: DF.Table[DynamicLink]
-		canonical_uri: DF.Data | None
 		code_list: DF.Link
 		common_code: DF.Data
 		description: DF.SmallText | None

erpnext/manufacturing/doctype/bom/bom.py

@@ -7,7 +7,7 @@ from collections import deque
 from operator import itemgetter
 
 import frappe
-from frappe import _, bold
+from frappe import _
 from frappe.core.doctype.version.version import get_diff
 from frappe.model.mapper import get_mapped_doc
 from frappe.utils import cint, cstr, flt, today
@@ -554,16 +554,9 @@ class BOM(WebsiteGenerator):
 	def check_recursion(self, bom_list=None):
 		"""Check whether recursion occurs in any bom"""
 
-		def _throw_error(bom_name, production_item=None):
-			msg = _("BOM recursion: {1} cannot be parent or child of {0}").format(self.name, bom_name)
-			if production_item and bom_name != self.name:
-				msg += "<br><br>"
-				msg += _(
-					"Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
-				).format(bold(production_item))
-
+		def _throw_error(bom_name):
 			frappe.throw(
-				msg,
+				_("BOM recursion: {1} cannot be parent or child of {0}").format(self.name, bom_name),
 				exc=BOMRecursionError,
 			)
 
@@ -580,7 +573,7 @@ class BOM(WebsiteGenerator):
 			if self.item == item.item_code and item.bom_no:
 				# Same item but with different BOM should not be allowed.
 				# Same item can appear recursively once as long as it doesn't have BOM.
-				_throw_error(item.bom_no, self.item)
+				_throw_error(item.bom_no)
 
 		if self.name in {d.bom_no for d in self.items}:
 			_throw_error(self.name)

erpnext/manufacturing/doctype/job_card/job_card.py

@@ -443,7 +443,7 @@ class JobCard(Document):
 			op_row.employee.append(time_log.employee)
 			if time_log.time_in_mins:
 				op_row.completed_time += time_log.time_in_mins
-				op_row.completed_qty += flt(time_log.completed_qty)
+				op_row.completed_qty += time_log.completed_qty
 
 		for row in self.sub_operations:
 			operation_deatils = operation_wise_completed_time.get(row.sub_operation)

erpnext/manufacturing/doctype/production_plan/production_plan.js

@@ -37,14 +37,6 @@ frappe.ui.form.on("Production Plan", {
 			};
 		});
 
-		frm.set_query("sub_assembly_warehouse", function (doc) {
-			return {
-				filters: {
-					company: doc.company,
-				},
-			};
-		});
-
 		frm.set_query("material_request", "material_requests", function () {
 			return {
 				filters: {

erpnext/manufacturing/doctype/production_plan/production_plan.py

@@ -1048,7 +1048,6 @@ def get_exploded_items(item_details, company, bom_no, include_non_stock_items, p
 			item.purchase_uom,
 			item_uom.conversion_factor,
 			item.safety_stock,
-			bom.item.as_("main_bom_item"),
 		)
 		.where(
 			(bei.docstatus < 2)
@@ -1116,7 +1115,6 @@ def get_subitems(
 			item_default.default_warehouse,
 			item.purchase_uom,
 			item_uom.conversion_factor,
-			bom.item.as_("main_bom_item"),
 		)
 		.where(
 			(bom.name == bom_no)
@@ -1230,7 +1228,6 @@ def get_material_request_items(
 			"sales_order": sales_order,
 			"description": row.get("description"),
 			"uom": row.get("purchase_uom") or row.get("stock_uom"),
-			"main_bom_item": row.get("main_bom_item"),
 		}
 
 
@@ -1760,7 +1757,6 @@ def get_raw_materials_of_sub_assembly_items(
 			item.purchase_uom,
 			item_uom.conversion_factor,
 			item.safety_stock,
-			bom.item.as_("main_bom_item"),
 		)
 		.where(
 			(bei.docstatus == 1)

erpnext/manufacturing/doctype/work_order/work_order.py

@@ -1322,20 +1322,20 @@ def stop_unstop(work_order, status):
 
 
 @frappe.whitelist()
-def query_sales_order(production_item: str) -> list[str]:
-	return frappe.get_list(
-		"Sales Order",
-		filters=[
-			["Sales Order", "docstatus", "=", 1],
-		],
-		or_filters=[
-			["Sales Order Item", "item_code", "=", production_item],
-			["Packed Item", "item_code", "=", production_item],
-		],
-		pluck="name",
-		distinct=True,
+def query_sales_order(production_item):
+	out = frappe.db.sql_list(
+		"""
+		select distinct so.name from `tabSales Order` so, `tabSales Order Item` so_item
+		where so_item.parent=so.name and so_item.item_code=%s and so.docstatus=1
+	union
+		select distinct so.name from `tabSales Order` so, `tabPacked Item` pi_item
+		where pi_item.parent=so.name and pi_item.item_code=%s and so.docstatus=1
+	""",
+		(production_item, production_item),
 	)
 
+	return out
+
 
 @frappe.whitelist()
 def make_job_card(work_order, operations):

erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py

@@ -23,7 +23,6 @@ def get_columns():
 	"""return columns"""
 	columns = [
 		_("Item") + ":Link/Item:150",
-		_("Item Name") + "::240",
 		_("Description") + "::300",
 		_("BOM Qty") + ":Float:160",
 		_("BOM UoM") + "::160",
@@ -74,12 +73,11 @@ def get_bom_stock(filters):
 		.on((BOM_ITEM.item_code == BIN.item_code) & (CONDITIONS))
 		.select(
 			BOM_ITEM.item_code,
-			BOM_ITEM.item_name,
 			BOM_ITEM.description,
 			BOM_ITEM.stock_qty,
 			BOM_ITEM.stock_uom,
 			BOM_ITEM.stock_qty * qty_to_produce / BOM.quantity,
-			BIN.actual_qty.as_("actual_qty"),
+			Sum(BIN.actual_qty).as_("actual_qty"),
 			Sum(Floor(BIN.actual_qty / (BOM_ITEM.stock_qty * qty_to_produce / BOM.quantity))),
 		)
 		.where((BOM_ITEM.parent == filters.get("bom")) & (BOM_ITEM.parenttype == "BOM"))