nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-28 17:34:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: changes as per review

Browse Source 
(cherry picked from commit 251e7b623c)
This commit is contained in:
ljain112
2026-05-27 13:06:07 +05:30
committed by Mergify
parent 82e12d2d52
commit 8b1d9817a6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
View File

@@ -7,7 +7,7 @@ import frappe
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from frappe.query_builder.functions import Sum from frappe.query_builder.functions import Sum
from frappe.utils import getdate from frappe.utils import cstr, getdate
from erpnext import allow_regional from erpnext import allow_regional
from erpnext.controllers.accounts_controller import validate_account_head from erpnext.controllers.accounts_controller import validate_account_head
@@ -48,7 +48,7 @@ class TaxWithholdingCategory(Document):
for d in self.get("rates"): for d in self.get("rates"):
if getdate(d.from_date) >= getdate(d.to_date): if getdate(d.from_date) >= getdate(d.to_date):
frappe.throw(_("Row #{0}: From Date cannot be before To Date").format(d.idx)) frappe.throw(_("Row #{0}: From Date cannot be before To Date").format(d.idx))
group_rates[d.tax_withholding_group or ""].append(d) group_rates[cstr(d.tax_withholding_group)].append(d)
# Validate overlapping dates within each group # Validate overlapping dates within each group
for group, rates in group_rates.items(): for group, rates in group_rates.items():
@@ -92,9 +92,9 @@ class TaxWithholdingCategory(Document):
def get_applicable_tax_row(self, posting_date, tax_withholding_group): def get_applicable_tax_row(self, posting_date, tax_withholding_group):
for row in self.rates: for row in self.rates:
if getdate(row.from_date) <= getdate(posting_date) <= getdate(row.to_date) and ( if getdate(row.from_date) <= getdate(posting_date) <= getdate(row.to_date) and cstr(
row.tax_withholding_group or "" row.tax_withholding_group
) == (tax_withholding_group or ""): ) == cstr(tax_withholding_group):
return row return row
frappe.throw(_("No Tax Withholding data found for the current posting date.")) frappe.throw(_("No Tax Withholding data found for the current posting date."))
@@ -115,7 +115,7 @@ class TaxWithholdingDetails:
def __init__( def __init__(
self, self,
tax_withholding_categories: list[str], tax_withholding_categories: list[str],
tax_withholding_group: str, tax_withholding_group: str | None,
posting_date: str, posting_date: str,
party_type: str, party_type: str,
party: str, party: str,