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

fix: Patch for updating tax withholding category dates (#27489)

Browse Source 
(cherry picked from commit c53b78e712)

# Conflicts:
#	erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py
#	erpnext/regional/india/setup.py
This commit is contained in:
Deepesh Garg
2021-09-14 20:28:48 +05:30
committed by Mergify
parent f5160dc83d
commit 0b20c70487
2 changed files with 169 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py
View File

@@ -11,6 +11,7 @@ def execute():
tds_category_rates = frappe.get_all("Tax Withholding Rate", fields=["name", "fiscal_year"]) tds_category_rates = frappe.get_all("Tax Withholding Rate", fields=["name", "fiscal_year"])
fiscal_year_map = {} fiscal_year_map = {}
<<<<<<< HEAD
fiscal_year_details = frappe.get_all( fiscal_year_details = frappe.get_all(
"Fiscal Year", fields=["name", "year_start_date", "year_end_date"] "Fiscal Year", fields=["name", "year_start_date", "year_end_date"]
) )
@@ -25,3 +26,18 @@ def execute():
frappe.db.set_value( frappe.db.set_value(
"Tax Withholding Rate", rate.name, {"from_date": from_date, "to_date": to_date} "Tax Withholding Rate", rate.name, {"from_date": from_date, "to_date": to_date}
) )
=======
fiscal_year_details = frappe.get_all('Fiscal Year', fields=['name', 'year_start_date', 'year_end_date'])
for d in fiscal_year_details:
fiscal_year_map.setdefault(d.name, d)
for rate in tds_category_rates:
from_date = fiscal_year_map.get(rate.fiscal_year).get('year_start_date')
to_date = fiscal_year_map.get(rate.fiscal_year).get('year_end_date')
frappe.db.set_value('Tax Withholding Rate', rate.name, {
'from_date': from_date,
'to_date': to_date
})
>>>>>>> c53b78e712 (fix: Patch for updating tax withholding category dates (#27489))

153
erpnext/regional/india/setup.py
View File

@@ -1394,7 +1394,11 @@ def set_tax_withholding_category(company):
accounts = [dict(company=company, account=tds_account)] accounts = [dict(company=company, account=tds_account)]
try: try:
<<<<<<< HEAD
fiscal_year_details = get_fiscal_year(today(), verbose=0) fiscal_year_details = get_fiscal_year(today(), verbose=0)
=======
fiscal_year_details = get_fiscal_year(today(), verbose=0, company=company)
>>>>>>> c53b78e712 (fix: Patch for updating tax withholding category dates (#27489))
except FiscalYearError: except FiscalYearError:
pass pass
@@ -1415,11 +1419,16 @@ def set_tax_withholding_category(company):
if fiscal_year_details: if fiscal_year_details:
# if fiscal year don't match with any of the already entered data, append rate row # if fiscal year don't match with any of the already entered data, append rate row
<<<<<<< HEAD
fy_exist = [ fy_exist = [
k k
for k in doc.get("rates") for k in doc.get("rates")
if k.get("from_date") <= fiscal_year_details[1] and k.get("to_date") >= fiscal_year_details[2] if k.get("from_date") <= fiscal_year_details[1] and k.get("to_date") >= fiscal_year_details[2]
] ]
=======
fy_exist = [k for k in doc.get('rates') if k.get('from_date') <= fiscal_year_details[1] \
and k.get('to_date') >= fiscal_year_details[2]]
>>>>>>> c53b78e712 (fix: Patch for updating tax withholding category dates (#27489))
if not fy_exist: if not fy_exist:
doc.append("rates", d.get("rates")[0]) doc.append("rates", d.get("rates")[0])
@@ -1430,6 +1439,7 @@ def set_tax_withholding_category(company):
doc.save() doc.save()
<<<<<<< HEAD
def set_tds_account(docs, company): def set_tds_account(docs, company):
parent_account = frappe.db.get_value( parent_account = frappe.db.get_value(
"Account", filters={"account_name": "Duties and Taxes", "company": company} "Account", filters={"account_name": "Duties and Taxes", "company": company}
@@ -1448,12 +1458,15 @@ def set_tds_account(docs, company):
) )
=======
>>>>>>> c53b78e712 (fix: Patch for updating tax withholding category dates (#27489))
def get_tds_details(accounts, fiscal_year_details): def get_tds_details(accounts, fiscal_year_details):
# bootstrap default tax withholding sections # bootstrap default tax withholding sections
return [ return [
dict( dict(
name="TDS - 194C - Company", name="TDS - 194C - Company",
category_name="Payment to Contractors (Single / Aggregate)", category_name="Payment to Contractors (Single / Aggregate)",
<<<<<<< HEAD
doctype="Tax Withholding Category", doctype="Tax Withholding Category",
accounts=accounts, accounts=accounts,
rates=[ rates=[
@@ -1871,6 +1884,146 @@ def get_tds_details(accounts, fiscal_year_details):
} }
], ],
), ),
=======
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 2, "single_threshold": 30000, "cumulative_threshold": 100000}]),
dict(name="TDS - 194C - Individual",
category_name="Payment to Contractors (Single / Aggregate)",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 1, "single_threshold": 30000, "cumulative_threshold": 100000}]),
dict(name="TDS - 194C - No PAN / Invalid PAN",
category_name="Payment to Contractors (Single / Aggregate)",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 20, "single_threshold": 30000, "cumulative_threshold": 100000}]),
dict(name="TDS - 194D - Company",
category_name="Insurance Commission",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 5, "single_threshold": 15000, "cumulative_threshold": 0}]),
dict(name="TDS - 194D - Company Assessee",
category_name="Insurance Commission",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 10, "single_threshold": 15000, "cumulative_threshold": 0}]),
dict(name="TDS - 194D - Individual",
category_name="Insurance Commission",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 5, "single_threshold": 15000, "cumulative_threshold": 0}]),
dict(name="TDS - 194D - No PAN / Invalid PAN",
category_name="Insurance Commission",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 20, "single_threshold": 15000, "cumulative_threshold": 0}]),
dict(name="TDS - 194DA - Company",
category_name="Non-exempt payments made under a life insurance policy",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 1, "single_threshold": 100000, "cumulative_threshold": 0}]),
dict(name="TDS - 194DA - Individual",
category_name="Non-exempt payments made under a life insurance policy",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 1, "single_threshold": 100000, "cumulative_threshold": 0}]),
dict(name="TDS - 194DA - No PAN / Invalid PAN",
category_name="Non-exempt payments made under a life insurance policy",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 20, "single_threshold": 100000, "cumulative_threshold": 0}]),
dict(name="TDS - 194H - Company",
category_name="Commission / Brokerage",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 5, "single_threshold": 15000, "cumulative_threshold": 0}]),
dict(name="TDS - 194H - Individual",
category_name="Commission / Brokerage",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 5, "single_threshold": 15000, "cumulative_threshold": 0}]),
dict(name="TDS - 194H - No PAN / Invalid PAN",
category_name="Commission / Brokerage",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 20, "single_threshold": 15000, "cumulative_threshold": 0}]),
dict(name="TDS - 194I - Rent - Company",
category_name="Rent",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 10, "single_threshold": 180000, "cumulative_threshold": 0}]),
dict(name="TDS - 194I - Rent - Individual",
category_name="Rent",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 10, "single_threshold": 180000, "cumulative_threshold": 0}]),
dict(name="TDS - 194I - Rent - No PAN / Invalid PAN",
category_name="Rent",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 20, "single_threshold": 180000, "cumulative_threshold": 0}]),
dict(name="TDS - 194I - Rent/Machinery - Company",
category_name="Rent-Plant / Machinery",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 2, "single_threshold": 180000, "cumulative_threshold": 0}]),
dict(name="TDS - 194I - Rent/Machinery - Individual",
category_name="Rent-Plant / Machinery",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 2, "single_threshold": 180000, "cumulative_threshold": 0}]),
dict(name="TDS - 194I - Rent/Machinery - No PAN / Invalid PAN",
category_name="Rent-Plant / Machinery",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 20, "single_threshold": 180000, "cumulative_threshold": 0}]),
dict(name="TDS - 194J - Professional Fees - Company",
category_name="Professional Fees",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 10, "single_threshold": 30000, "cumulative_threshold": 0}]),
dict(name="TDS - 194J - Professional Fees - Individual",
category_name="Professional Fees",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 10, "single_threshold": 30000, "cumulative_threshold": 0}]),
dict(name="TDS - 194J - Professional Fees - No PAN / Invalid PAN",
category_name="Professional Fees",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 20, "single_threshold": 30000, "cumulative_threshold": 0}]),
dict(name="TDS - 194J - Director Fees - Company",
category_name="Director Fees",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 10, "single_threshold": 0, "cumulative_threshold": 0}]),
dict(name="TDS - 194J - Director Fees - Individual",
category_name="Director Fees",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 10, "single_threshold": 0, "cumulative_threshold": 0}]),
dict(name="TDS - 194J - Director Fees - No PAN / Invalid PAN",
category_name="Director Fees",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 20, "single_threshold": 0, "cumulative_threshold": 0}]),
dict(name="TDS - 194 - Dividends - Company",
category_name="Dividends",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 10, "single_threshold": 2500, "cumulative_threshold": 0}]),
dict(name="TDS - 194 - Dividends - Individual",
category_name="Dividends",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 10, "single_threshold": 2500, "cumulative_threshold": 0}]),
dict(name="TDS - 194 - Dividends - No PAN / Invalid PAN",
category_name="Dividends",
doctype="Tax Withholding Category", accounts=accounts,
rates=[{"from_date": fiscal_year_details[1], "to_date": fiscal_year_details[2],
"tax_withholding_rate": 20, "single_threshold": 2500, "cumulative_threshold": 0}])
>>>>>>> c53b78e712 (fix: Patch for updating tax withholding category dates (#27489))
] ]