nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-21 07:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: rate based on posting date in Tax Withholding Report

Browse Source 
(cherry picked from commit a32a79e90a)
This commit is contained in:
ljain112
2025-04-17 20:23:48 +05:30
committed by Mergify
parent 522597d22b
commit 17dc87a2df
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
View File

@@ -4,6 +4,7 @@
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import getdate
def execute(filters=None): def execute(filters=None):
@@ -33,6 +34,7 @@ def execute(filters=None):
def validate_filters(filters): def validate_filters(filters):
"""Validate if dates are properly set""" """Validate if dates are properly set"""
filters = frappe._dict(filters or {})
if filters.from_date > filters.to_date: if filters.from_date > filters.to_date:
frappe.throw(_("From Date must be before To Date")) frappe.throw(_("From Date must be before To Date"))
@@ -68,7 +70,7 @@ def get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_
if not tax_withholding_category: if not tax_withholding_category:
tax_withholding_category = party_map.get(party, {}).get("tax_withholding_category") tax_withholding_category = party_map.get(party, {}).get("tax_withholding_category")
rate = tax_rate_map.get(tax_withholding_category) rate = get_tax_withholding_rates(tax_rate_map.get(tax_withholding_category, []), posting_date)
if net_total_map.get((voucher_type, name)): if net_total_map.get((voucher_type, name)):
if voucher_type == "Journal Entry" and tax_amount and rate: if voucher_type == "Journal Entry" and tax_amount and rate:
# back calcalute total amount from rate and tax_amount # back calcalute total amount from rate and tax_amount
@@ -435,12 +437,22 @@ def get_doc_info(vouchers, doctype, tax_category_map, net_total_map=None):
def get_tax_rate_map(filters): def get_tax_rate_map(filters):
rate_map = frappe.get_all( rate_map = frappe.get_all(
"Tax Withholding Rate", "Tax Withholding Rate",
filters={ filters={"from_date": ("<=", filters.to_date), "to_date": (">=", filters.from_date)},
"from_date": ("<=", filters.get("from_date")), fields=["parent", "tax_withholding_rate", "from_date", "to_date"],
"to_date": (">=", filters.get("to_date")),
},
fields=["parent", "tax_withholding_rate"],
as_list=1,
) )
return frappe._dict(rate_map) 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