fix: update TDS application logic to consider tax withholding group in addition to category for sales and purchase invoices.

Author: ljain112

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js

@@ -363,7 +363,8 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 			},
 			function () {
 				me.apply_pricing_rule();
-				me.frm.doc.apply_tds = me.frm.tax_withholding_category ? 1 : 0;
+				me.frm.doc.apply_tds =
+					me.frm.tax_withholding_category || me.frm.tax_withholding_group ? 1 : 0;
 				me.frm.clear_table("tax_withholding_entries");
 
 				// while duplicating, don't change payment terms
@@ -670,7 +671,7 @@ frappe.ui.form.on("Purchase Invoice", {
 	onload: function (frm) {
 		if (frm.doc.__onload && frm.doc.supplier) {
 			if (frm.is_new()) {
-				frm.doc.apply_tds = frm.doc.__onload.tax_withholding_category ? 1 : 0;
+				frm.doc.apply_tds = frm.doc.__onload.apply_tds ? 1 : 0;
 			}
 		}
 

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -241,10 +241,10 @@ def __init__(self, *args, **kwargs):
 
 	def onload(self):
 		super().onload()
-		tax_withholding_category = frappe.get_cached_value(
-			"Supplier", self.supplier, "tax_withholding_category"
+		tax_withholding_category, tax_withholding_group = frappe.get_cached_value(
+			"Supplier", self.supplier, ["tax_withholding_category", "tax_withholding_group"]
 		)
-		self.set_onload("tax_withholding_category", tax_withholding_category)
+		self.set_onload("apply_tds", tax_withholding_category or tax_withholding_group)
 
 		if self.is_new():
 			self.set("tax_withholding_entries", [])
@@ -351,10 +351,12 @@ def set_missing_values(self, for_validate=False):
 				template_name=self.payment_terms_template,
 			)
 
-		tds_category = frappe.get_cached_value("Supplier", self.supplier, "tax_withholding_category")
-		if tds_category and not for_validate:
-			self.apply_tds = 1
-			self.set_onload("tax_withholding_category", tds_category)
+		tax_withholding_category, tax_withholding_group = frappe.get_cached_value(
+			"Supplier", self.supplier, ["tax_withholding_category", "tax_withholding_group"]
+		)
+		if not for_validate:
+			if tax_withholding_category or tax_withholding_group:
+				self.apply_tds = 1
 
 		super().set_missing_values(for_validate)
 

erpnext/accounts/doctype/sales_invoice/sales_invoice.js

@@ -383,8 +383,8 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends (
 				),
 			},
 			function () {
-				me.frm.doc.apply_tds = me.frm.tax_withholding_category ? 1 : 0;
-				me.frm.set_df_property("apply_tds", "read_only", me.frm.tax_withholding_category ? 0 : 1);
+				me.frm.doc.apply_tds =
+					me.frm.tax_withholding_category || me.frm.tax_withholding_group ? 1 : 0;
 				me.frm.clear_table("tax_withholding_entries");
 				me.apply_pricing_rule();
 			}
@@ -825,7 +825,7 @@ frappe.ui.form.on("Sales Invoice", {
 
 		if (frm.doc.__onload && frm.doc.customer) {
 			if (frm.is_new()) {
-				frm.doc.apply_tds = frm.doc.__onload.tax_withholding_category ? 1 : 0;
+				frm.doc.apply_tds = frm.doc.__onload.apply_tds ? 1 : 0;
 			}
 		}
 

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -288,10 +288,10 @@ def set_indicator(self):
 
 	def onload(self):
 		super().onload()
-		tax_withholding_category = frappe.get_cached_value(
-			"Customer", self.customer, "tax_withholding_category"
+		tax_withholding_category, tax_withholding_group = frappe.get_cached_value(
+			"Customer", self.customer, ["tax_withholding_category", "tax_withholding_group"]
 		)
-		self.set_onload("tax_withholding_category", tax_withholding_category)
+		self.set_onload("apply_tds", tax_withholding_category or tax_withholding_group)
 
 	def validate(self):
 		self.validate_auto_set_posting_time()

erpnext/accounts/doctype/subscription/subscription.py

@@ -411,7 +411,10 @@ def create_invoice(
 			invoice.customer = self.party
 		else:
 			invoice.supplier = self.party
-			if frappe.db.get_value("Supplier", self.party, "tax_withholding_category"):
+			tax_withholding_category, tax_withholding_group = frappe.get_cached_value(
+				"Supplier", self.party, ["tax_withholding_category", "tax_withholding_group"]
+			)
+			if tax_withholding_category or tax_withholding_group:
 				invoice.apply_tds = 1
 
 		# Add currency to invoice

erpnext/public/js/utils/party.js

@@ -109,6 +109,7 @@ erpnext.utils.get_party_details = function (frm, method, args, callback) {
 		callback: function (r) {
 			if (r.message) {
 				frm.tax_withholding_category = r.message.tax_withholding_category;
+				frm.tax_withholding_group = r.message.tax_withholding_group;
 				frm.updating_party_details = true;
 				frappe.run_serially([
 					() => frm.set_value(r.message),