From c3d890f3f18f209cc2a6ba3ccb75f66470d14616 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Sun, 2 Jan 2022 19:10:49 +0530
Subject: [PATCH] fix: get fiscal year based on date

---
 .../doctype/purchase_invoice/test_purchase_invoice.py         | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index 699af608253..21846bb76c8 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -1236,11 +1236,7 @@ def check_gl_entries(doc, voucher_no, expected_gle, posting_date):
 def update_tax_witholding_category(company, account):
 	from erpnext.accounts.utils import get_fiscal_year
 
-<<<<<<< HEAD
-	fiscal_year = get_fiscal_year(fiscal_year='2021')
-=======
 	fiscal_year = get_fiscal_year(date=nowdate())
->>>>>>> 342658ea70 (fix: Test Case)
 
 	if not frappe.db.get_value('Tax Withholding Rate',
 		{'parent': 'TDS - 194 - Dividends - Individual', 'from_date': ('>=', fiscal_year[1]),