fix: Linting Issues

(cherry picked from commit e7e2ce1271)

# Conflicts:
#	erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
#	erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py

erpnext/__init__.py

@@ -4,7 +4,7 @@ import frappe
 
 from erpnext.hooks import regional_overrides
 
-__version__ = "13.55.2"
+__version__ = "13.54.4"
 
 
 def get_default_company(user=None):

erpnext/accounts/doctype/fiscal_year/fiscal_year_dashboard.py

@@ -11,5 +11,17 @@ def get_data():
 				"label": _("Target Details"),
 				"items": ["Sales Person", "Sales Partner", "Territory", "Monthly Distribution"],
 			},
+<<<<<<< HEAD
 		],
+=======
+			{
+				'label': _('References'),
+				'items': ['Period Closing Voucher']
+			},
+			{
+				'label': _('Target Details'),
+				'items': ['Sales Person', 'Sales Partner', 'Territory', 'Monthly Distribution']
+			}
+		]
+>>>>>>> 51d9572fe7 (fix: Hardcode fiscal year and posting date)
 	}

erpnext/accounts/doctype/pos_invoice/pos_invoice.py

@@ -704,7 +704,7 @@ def get_pos_reserved_qty(item_code, warehouse):
 	reserved_qty = (
 		frappe.qb.from_(p_inv)
 		.from_(p_item)
-		.select(Sum(p_item.qty).as_("qty"))
+		.select(Sum(p_item.stock_qty).as_("stock_qty"))
 		.where(
 			(p_inv.name == p_item.parent)
 			& (IfNull(p_inv.consolidated_invoice, "") == "")
@@ -715,7 +715,7 @@ def get_pos_reserved_qty(item_code, warehouse):
 		)
 	).run(as_dict=True)
 
-	return reserved_qty[0].qty or 0 if reserved_qty else 0
+	return flt(reserved_qty[0].stock_qty) if reserved_qty else 0
 
 
 @frappe.whitelist()

erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

@@ -1394,6 +1394,7 @@ class TestPurchaseInvoice(unittest.TestCase, StockTestMixin):
 		)
 
 		# Update tax withholding category with current fiscal year and rate details
+<<<<<<< HEAD
 		update_tax_witholding_category("_Test Company", "TDS Payable - _TC")
 
 		# Create Purchase Order with TDS applied
@@ -1404,6 +1405,15 @@ class TestPurchaseInvoice(unittest.TestCase, StockTestMixin):
 			item="_Test Non Stock Item",
 			posting_date="2021-09-15",
 		)
+=======
+		update_tax_witholding_category('_Test Company', 'TDS Payable - _TC')
+
+		# Create Purchase Order with TDS applied
+		po = create_purchase_order(do_not_save=1, supplier=supplier.name, rate=3000, item='_Test Non Stock Item',
+			posting_date='2021-09-15')
+		po.apply_tds = 1
+		po.tax_withholding_category = 'TDS - 194 - Dividends - Individual'
+>>>>>>> 51d9572fe7 (fix: Hardcode fiscal year and posting date)
 		po.save()
 		po.submit()
 
@@ -1667,12 +1677,29 @@ def check_gl_entries(doc, voucher_no, expected_gle, posting_date):
 		doc.assertEqual(expected_gle[i][2], gle.credit)
 		doc.assertEqual(getdate(expected_gle[i][3]), gle.posting_date)
 
+<<<<<<< HEAD
 
 def update_tax_witholding_category(company, account):
 	from erpnext.accounts.utils import get_fiscal_year
 
+<<<<<<< HEAD
 	fiscal_year = get_fiscal_year(date=nowdate())
+=======
+	fiscal_year = get_fiscal_year(date=date, company=company)
+	print(fiscal_year[0], fiscal_year[1], fiscal_year[2], "$#$#$#")
+>>>>>>> 092d41ecda (fix: Debug CI)
+=======
+def update_tax_witholding_category(company, account):
+	from erpnext.accounts.utils import get_fiscal_year
 
+<<<<<<< HEAD
+	fiscal_year = get_fiscal_year(fiscal_year='_Test Fiscal Year 2021')
+>>>>>>> 51d9572fe7 (fix: Hardcode fiscal year and posting date)
+=======
+	fiscal_year = get_fiscal_year(fiscal_year='2021')
+>>>>>>> c33bbd4f39 (fix: Test Case)
+
+<<<<<<< HEAD
 	if not frappe.db.get_value(
 		"Tax Withholding Rate",
 		{
@@ -1694,6 +1721,21 @@ def update_tax_witholding_category(company, account):
 				"cumulative_threshold": 0,
 			},
 		)
+=======
+	if not frappe.db.get_value('Tax Withholding Rate',
+		{'parent': 'TDS - 194 - Dividends - Individual', 'from_date': ('>=', fiscal_year[1]),
+			'to_date': ('<=', fiscal_year[2])}):
+		tds_category = frappe.get_doc('Tax Withholding Category', 'TDS - 194 - Dividends - Individual')
+		tds_category.set('rates', [])
+
+		tds_category.append('rates', {
+			'from_date': fiscal_year[1],
+			'to_date': fiscal_year[2],
+			'tax_withholding_rate': 10,
+			'single_threshold': 2500,
+			'cumulative_threshold': 0
+		})
+>>>>>>> d06221ad7a (fix: Advance TDS test case)
 		tds_category.save()
 
 	if not frappe.db.get_value(

erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py

@@ -5,7 +5,11 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
+<<<<<<< HEAD
 from frappe.utils import cint, flt, getdate
+=======
+from frappe.utils import cint, getdate
+>>>>>>> e7e2ce1271 (fix: Linting Issues)
 
 
 class TaxWithholdingCategory(Document):
@@ -15,11 +19,17 @@ class TaxWithholdingCategory(Document):
 
 	def validate_dates(self):
 		last_date = None
+<<<<<<< HEAD
 		for d in self.get("rates"):
+=======
+		for d in self.get('rates'):
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 			if getdate(d.from_date) >= getdate(d.to_date):
 				frappe.throw(_("Row #{0}: From Date cannot be before To Date").format(d.idx))
 
 			# validate overlapping of dates
+<<<<<<< HEAD
+<<<<<<< HEAD
 			if last_date and getdate(d.to_date) < getdate(last_date):
 				frappe.throw(_("Row #{0}: Dates overlapping with other row").format(d.idx))
 
@@ -34,6 +44,18 @@ class TaxWithholdingCategory(Document):
 					)
 				)
 
+=======
+			if last_date and getdate(r.to_date) < getdate(last_date):
+=======
+			if last_date and getdate(d.to_date) < getdate(last_date):
+>>>>>>> b6d0b17ed6 (fix: Linting and patch fixes)
+				frappe.throw(_("Row #{0}: Dates overlapping with other row").format(d.idx))
+
+	def validate_thresholds(self):
+		for d in self.get('rates'):
+			if d.cumulative_threshold and d.cumulative_threshold < d.single_threshold:
+				frappe.throw(_("Row #{0}: Cumulative threshold cannot be less than Single Transaction threshold").format(d.idx))
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 
 def get_party_details(inv):
 	party_type, party = "", ""
@@ -82,7 +104,11 @@ def get_party_tax_withholding_details(inv, tax_withholding_category=None):
 	if not parties:
 		parties.append(party)
 
+<<<<<<< HEAD
 	posting_date = inv.get("posting_date") or inv.get("transaction_date")
+=======
+	posting_date = inv.get('posting_date') or inv.get('transaction_date')
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 	tax_details = get_tax_withholding_details(tax_withholding_category, posting_date, inv.company)
 
 	if not tax_details:
@@ -100,8 +126,15 @@ def get_party_tax_withholding_details(inv, tax_withholding_category=None):
 			).format(tax_withholding_category, inv.company, party)
 		)
 
+<<<<<<< HEAD
 	tax_amount, tax_deducted, tax_deducted_on_advances, voucher_wise_amount = get_tax_amount(
 		party_type, parties, inv, tax_details, posting_date, pan_no
+=======
+	tax_amount, tax_deducted = get_tax_amount(
+		party_type, parties,
+		inv, tax_details,
+		posting_date, pan_no
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 	)
 
 	if party_type == "Supplier":
@@ -114,7 +147,10 @@ def get_party_tax_withholding_details(inv, tax_withholding_category=None):
 	else:
 		return tax_row
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 def get_tax_withholding_details(tax_withholding_category, posting_date, company):
 	tax_withholding = frappe.get_doc("Tax Withholding Category", tax_withholding_category)
 
@@ -122,6 +158,7 @@ def get_tax_withholding_details(tax_withholding_category, posting_date, company)
 
 	for account_detail in tax_withholding.accounts:
 		if company == account_detail.company:
+<<<<<<< HEAD
 			return frappe._dict(
 				{
 					"tax_withholding_category": tax_withholding_category,
@@ -141,6 +178,21 @@ def get_tax_withholding_details(tax_withholding_category, posting_date, company)
 			)
 
 
+=======
+			return frappe._dict({
+				"account_head": account_detail.account,
+				"rate": tax_rate_detail.tax_withholding_rate,
+				"from_date": tax_rate_detail.from_date,
+				"to_date": tax_rate_detail.to_date,
+				"threshold": tax_rate_detail.single_threshold,
+				"cumulative_threshold": tax_rate_detail.cumulative_threshold,
+				"description": tax_withholding.category_name if tax_withholding.category_name else tax_withholding_category,
+				"consider_party_ledger_amount": tax_withholding.consider_party_ledger_amount,
+				"tax_on_excess_amount": tax_withholding.tax_on_excess_amount,
+				"round_off_tax_amount": tax_withholding.round_off_tax_amount
+			})
+
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 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.rates:
@@ -148,7 +200,10 @@ def get_tax_withholding_rates(tax_withholding, posting_date):
 			return rate
 
 	frappe.throw(_("No Tax Withholding data found for the current posting date."))
+<<<<<<< HEAD
 
+=======
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 
 def get_tax_row_for_tcs(inv, tax_details, tax_amount, tax_deducted):
 	row = {
@@ -190,6 +245,7 @@ def get_tax_row_for_tds(tax_details, tax_amount):
 		"account_head": tax_details.account_head,
 	}
 
+<<<<<<< HEAD
 
 def get_lower_deduction_certificate(tax_details, pan_no):
 	ldc_name = frappe.db.get_value(
@@ -218,6 +274,23 @@ def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=N
 		to_date=tax_details.to_date,
 		party_type=party_type,
 	)
+=======
+def get_lower_deduction_certificate(tax_details, pan_no):
+	ldc_name = frappe.db.get_value('Lower Deduction Certificate',
+		{
+			'pan_no': pan_no,
+			'valid_from': ('>=', tax_details.from_date),
+			'valid_upto': ('<=', tax_details.to_date)
+		}, 'name')
+
+	if ldc_name:
+		return frappe.get_doc('Lower Deduction Certificate', ldc_name)
+
+def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=None):
+	vouchers = get_invoice_vouchers(parties, tax_details, inv.company, party_type=party_type)
+	advance_vouchers = get_advance_vouchers(parties, company=inv.company, from_date=tax_details.from_date,
+		to_date=tax_details.to_date, party_type=party_type)
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 	taxable_vouchers = vouchers + advance_vouchers
 	tax_deducted_on_advances = 0
 
@@ -229,17 +302,29 @@ def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=N
 		tax_deducted = get_deducted_tax(taxable_vouchers, tax_details)
 
 	tax_amount = 0
+<<<<<<< HEAD
 
 	if party_type == "Supplier":
+=======
+	if party_type == 'Supplier':
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 		ldc = get_lower_deduction_certificate(tax_details, pan_no)
 		if tax_deducted:
 			net_total = inv.net_total
 			if ldc:
+<<<<<<< HEAD
 				tax_amount = get_tds_amount_from_ldc(
 					ldc, parties, pan_no, tax_details, posting_date, net_total
 				)
 			else:
 				tax_amount = net_total * tax_details.rate / 100 if net_total > 0 else 0
+=======
+				tax_amount = get_tds_amount_from_ldc(ldc, parties, pan_no, tax_details, posting_date, net_total)
+			else:
+				tax_amount = net_total * tax_details.rate / 100 if net_total > 0 else 0
+		else:
+			tax_amount = get_tds_amount(ldc, parties, inv, tax_details, tax_deducted, vouchers)
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 
 			# once tds is deducted, not need to add vouchers in the invoice
 			voucher_wise_amount = {}
@@ -254,6 +339,7 @@ def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=N
 			#  if no TCS has been charged in FY,
 			# then chargeable value is "prev invoices + advances" value which cross the threshold
 			tax_amount = get_tcs_amount(parties, inv, tax_details, vouchers, advance_vouchers)
+<<<<<<< HEAD
 
 	if cint(tax_details.round_off_tax_amount):
 		tax_amount = normal_round(tax_amount)
@@ -360,9 +446,12 @@ def get_taxes_deducted_on_advances_allocated(inv, tax_details):
 				.where(at.account_head == tax_details.account_head)
 				.run(as_dict=True)
 			)
+=======
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 
 	return tax_info
 
+<<<<<<< HEAD
 
 def get_deducted_tax(taxable_vouchers, tax_details):
 	# check if TDS / TCS account is already charged on taxable vouchers
@@ -379,6 +468,57 @@ def get_deducted_tax(taxable_vouchers, tax_details):
 	return sum(entries)
 
 
+=======
+def get_invoice_vouchers(parties, tax_details, company, party_type='Supplier'):
+	dr_or_cr = 'credit' if party_type == 'Supplier' else 'debit'
+
+	filters = {
+		dr_or_cr: ['>', 0],
+		'company': company,
+		'party_type': party_type,
+		'party': ['in', parties],
+		'posting_date': ['between', (tax_details.from_date, tax_details.to_date)],
+		'is_opening': 'No',
+		'is_cancelled': 0
+	}
+
+	return frappe.get_all('GL Entry', filters=filters, distinct=1, pluck="voucher_no") or [""]
+
+def get_advance_vouchers(parties, company=None, from_date=None, to_date=None, party_type='Supplier'):
+	# for advance vouchers, debit and credit is reversed
+	dr_or_cr = 'debit' if party_type == 'Supplier' else 'credit'
+
+	filters = {
+		dr_or_cr: ['>', 0],
+		'is_opening': 'No',
+		'is_cancelled': 0,
+		'party_type': party_type,
+		'party': ['in', parties],
+		'against_voucher': ['is', 'not set']
+	}
+
+	if company:
+		filters['company'] = company
+	if from_date and to_date:
+		filters['posting_date'] = ['between', (from_date, to_date)]
+
+	return frappe.get_all('GL Entry', filters=filters, distinct=1, pluck='voucher_no') or [""]
+
+def get_deducted_tax(taxable_vouchers, tax_details):
+	# check if TDS / TCS account is already charged on taxable vouchers
+	filters = {
+		'is_cancelled': 0,
+		'credit': ['>', 0],
+		'posting_date': ['between', (tax_details.from_date, tax_details.to_date)],
+		'account': tax_details.account_head,
+		'voucher_no': ['in', taxable_vouchers],
+	}
+	field = "credit"
+
+	entries = frappe.db.get_all('GL Entry', filters, pluck=field)
+	return sum(entries)
+
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 def get_tds_amount(ldc, parties, inv, tax_details, tax_deducted, vouchers):
 	tds_amount = 0
 	supp_credit_amt = 0.0
@@ -411,8 +551,13 @@ def get_tds_amount(ldc, parties, inv, tax_details, tax_deducted, vouchers):
 	supp_credit_amt += supp_jv_credit_amt
 	supp_credit_amt += inv.net_total
 
+<<<<<<< HEAD
 	threshold = tax_details.get("threshold", 0)
 	cumulative_threshold = tax_details.get("cumulative_threshold", 0)
+=======
+	debit_note_amount = get_debit_note_amount(parties, tax_details.from_date, tax_details.to_date, inv.company)
+	supp_credit_amt -= debit_note_amount
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 
 	if (threshold and inv.net_total >= threshold) or (
 		cumulative_threshold and supp_credit_amt >= cumulative_threshold
@@ -443,11 +588,16 @@ def get_tds_amount(ldc, parties, inv, tax_details, tax_deducted, vouchers):
 
 	return tds_amount
 
+<<<<<<< HEAD
 
 def get_tcs_amount(parties, inv, tax_details, vouchers, adv_vouchers):
 	tcs_amount = 0
 	invoiced_amt = 0
 	advance_amt = 0
+=======
+def get_tcs_amount(parties, inv, tax_details, vouchers, adv_vouchers):
+	tcs_amount = 0
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 
 	# sum of debit entries made from sales invoices
 	if vouchers:
@@ -482,6 +632,7 @@ def get_tcs_amount(parties, inv, tax_details, vouchers, adv_vouchers):
 		)
 
 	# sum of credit entries made from sales invoice
+<<<<<<< HEAD
 	credit_note_amt = sum(
 		frappe.db.get_all(
 			"GL Entry",
@@ -496,6 +647,16 @@ def get_tcs_amount(parties, inv, tax_details, vouchers, adv_vouchers):
 			pluck="credit",
 		)
 	)
+=======
+	credit_note_amt = sum(frappe.db.get_all('GL Entry', {
+		'is_cancelled': 0,
+		'credit': ['>', 0],
+		'party': ['in', parties],
+		'posting_date': ['between', (tax_details.from_date, tax_details.to_date)],
+		'company': inv.company,
+		'voucher_type': 'Sales Invoice',
+	}, pluck='credit'))
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 
 	cumulative_threshold = tax_details.get("cumulative_threshold", 0)
 
@@ -515,7 +676,10 @@ def get_invoice_total_without_tcs(inv, tax_details):
 
 	return inv.grand_total - tcs_tax_row_amount
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 def get_tds_amount_from_ldc(ldc, parties, pan_no, tax_details, posting_date, net_total):
 	tds_amount = 0
 
@@ -542,6 +706,23 @@ def get_tds_amount_from_ldc(ldc, parties, pan_no, tax_details, posting_date, net
 
 	return tds_amount
 
+<<<<<<< HEAD
+=======
+def get_debit_note_amount(suppliers, from_date, to_date, company=None):
+
+	filters = {
+		'supplier': ['in', suppliers],
+		'is_return': 1,
+		'docstatus': 1,
+		'posting_date': ['between', (from_date, to_date)]
+	}
+	fields = ['abs(sum(net_total)) as net_total']
+
+	if company:
+		filters['company'] = company
+
+	return frappe.get_all('Purchase Invoice', filters, fields)[0].get('net_total') or 0.0
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
 
 def get_ltds_amount(current_amount, deducted_amount, certificate_limit, rate, tax_details):
 	if certificate_limit - flt(deducted_amount) - flt(current_amount) >= 0:

erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py

@@ -494,6 +494,7 @@ def create_tax_with_holding_category():
 	fiscal_year = get_fiscal_year(today(), company="_Test Company")
 	# Cumulative threshold
 	if not frappe.db.exists("Tax Withholding Category", "Cumulative Threshold TDS"):
+<<<<<<< HEAD
 		frappe.get_doc(
 			{
 				"doctype": "Tax Withholding Category",
@@ -629,3 +630,79 @@ def create_tax_with_holding_category():
 				"accounts": [{"company": "_Test Company", "account": "TDS - _TC"}],
 			}
 		).insert()
+=======
+		frappe.get_doc({
+			"doctype": "Tax Withholding Category",
+			"name": "Cumulative Threshold TDS",
+			"category_name": "10% TDS",
+			"rates": [{
+				'from_date': fiscal_year[1],
+				'to_date': fiscal_year[2],
+				'tax_withholding_rate': 10,
+				'single_threshold': 0,
+				'cumulative_threshold': 30000.00
+			}],
+			"accounts": [{
+				'company': '_Test Company',
+				'account': 'TDS - _TC'
+			}]
+		}).insert()
+
+	if not frappe.db.exists("Tax Withholding Category", "Cumulative Threshold TCS"):
+		frappe.get_doc({
+			"doctype": "Tax Withholding Category",
+			"name": "Cumulative Threshold TCS",
+			"category_name": "10% TCS",
+			"rates": [{
+				'from_date': fiscal_year[1],
+				'to_date': fiscal_year[2],
+				'tax_withholding_rate': 10,
+				'single_threshold': 0,
+				'cumulative_threshold': 30000.00
+			}],
+			"accounts": [{
+				'company': '_Test Company',
+				'account': 'TCS - _TC'
+			}]
+		}).insert()
+
+	# Single thresold
+	if not frappe.db.exists("Tax Withholding Category", "Single Threshold TDS"):
+		frappe.get_doc({
+			"doctype": "Tax Withholding Category",
+			"name": "Single Threshold TDS",
+			"category_name": "10% TDS",
+			"rates": [{
+				'from_date': fiscal_year[1],
+				'to_date': fiscal_year[2],
+				'tax_withholding_rate': 10,
+				'single_threshold': 20000.00,
+				'cumulative_threshold': 0
+			}],
+			"accounts": [{
+				'company': '_Test Company',
+				'account': 'TDS - _TC'
+			}]
+		}).insert()
+
+	if not frappe.db.exists("Tax Withholding Category", "New TDS Category"):
+		frappe.get_doc({
+			"doctype": "Tax Withholding Category",
+			"name": "New TDS Category",
+			"category_name": "New TDS Category",
+			"round_off_tax_amount": 1,
+			"consider_party_ledger_amount": 1,
+			"tax_on_excess_amount": 1,
+			"rates": [{
+				'from_date': fiscal_year[1],
+				'to_date': fiscal_year[2],
+				'tax_withholding_rate': 10,
+				'single_threshold': 0,
+				'cumulative_threshold': 30000
+			}],
+			"accounts": [{
+				'company': '_Test Company',
+				'account': 'TDS - _TC'
+			}]
+		}).insert()
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)

erpnext/accounts/doctype/tax_withholding_rate/tax_withholding_rate.json

@@ -28,14 +28,22 @@
   {
    "columns": 2,
    "fieldname": "single_threshold",
+<<<<<<< HEAD
    "fieldtype": "Float",
+=======
+   "fieldtype": "Currency",
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
    "in_list_view": 1,
    "label": "Single Transaction Threshold"
   },
   {
    "columns": 3,
    "fieldname": "cumulative_threshold",
+<<<<<<< HEAD
    "fieldtype": "Float",
+=======
+   "fieldtype": "Currency",
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
    "in_list_view": 1,
    "label": "Cumulative Transaction Threshold"
   },
@@ -59,7 +67,11 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2022-01-13 12:04:42.904263",
+=======
+ "modified": "2021-08-31 11:42:12.213977",
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Tax Withholding Rate",
@@ -68,6 +80,9 @@
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
+<<<<<<< HEAD
  "states": [],
+=======
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
  "track_changes": 1
 }

erpnext/patches.txt

@@ -311,6 +311,7 @@ execute:frappe.reload_doc("erpnext_integrations", "doctype", "TaxJar Settings")
 execute:frappe.reload_doc("erpnext_integrations", "doctype", "Product Tax Category")
 erpnext.patches.v13_0.custom_fields_for_taxjar_integration          #08-11-2021
 erpnext.patches.v13_0.set_operation_time_based_on_operating_cost
+<<<<<<< HEAD
 erpnext.patches.v13_0.create_website_items #30-09-2021
 erpnext.patches.v13_0.populate_e_commerce_settings
 erpnext.patches.v13_0.make_homepage_products_website_items
@@ -379,3 +380,7 @@ erpnext.patches.v13_0.update_asset_value_for_manual_depr_entries
 erpnext.patches.v13_0.update_docs_link
 erpnext.patches.v13_0.correct_asset_value_if_je_with_workflow
 execute:frappe.db.set_value("Accounts Settings", "Accounts Settings", "service_provider", "frankfurter.app")
+=======
+erpnext.patches.v13_0.validate_options_for_data_field
+erpnext.patches.v13_0.update_dates_in_tax_withholding_category
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)

erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py

@@ -2,6 +2,8 @@
 # License: GNU General Public License v3. See license.txt
 
 import frappe
+<<<<<<< HEAD
+<<<<<<< HEAD
 
 
 def execute():
@@ -25,3 +27,36 @@ def execute():
 			frappe.db.set_value(
 				"Tax Withholding Rate", rate.name, {"from_date": from_date, "to_date": to_date}
 			)
+=======
+=======
+
+>>>>>>> e7e2ce1271 (fix: Linting Issues)
+from erpnext.accounts.utils import get_fiscal_year
+
+
+def execute():
+	frappe.reload_doc('accounts', 'doctype', 'Tax Withholding Rate')
+
+	if frappe.db.has_column('Tax Withholding Rate', 'fiscal_year'):
+		tds_category_rates = frappe.get_all('Tax Withholding Rate', fields=['name', 'fiscal_year'])
+
+		fiscal_year_map = {}
+		for rate in tds_category_rates:
+			if not fiscal_year_map.get(rate.fiscal_year):
+				fiscal_year_map[rate.fiscal_year] = get_fiscal_year(fiscal_year=rate.fiscal_year)
+
+<<<<<<< HEAD
+		frappe.db.set_value('Tax Withholding Rate', rate.name, {
+			'from_date': from_date,
+			'to_date': to_date
+		})
+>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
+=======
+			from_date = fiscal_year_map.get(rate.fiscal_year)[1]
+			to_date = fiscal_year_map.get(rate.fiscal_year)[2]
+
+			frappe.db.set_value('Tax Withholding Rate', rate.name, {
+				'from_date': from_date,
+				'to_date': to_date
+			})
+>>>>>>> b6d0b17ed6 (fix: Linting and patch fixes)