Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Test Case

Browse Source 
(cherry picked from commit 342658ea7028cc0d890200364cc08cf97e55d6d0)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
This commit is contained in:
Deepesh Garg 2022-01-02 18:39:59 +05:30 committed by mergify-bot
parent 466e549842
commit 4b6217a683
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
View File

@ -1236,7 +1236,11 @@ def check_gl_entries(doc, voucher_no, expected_gle, posting_date):
def update_tax_witholding_category(company, account): def update_tax_witholding_category(company, account):
from erpnext.accounts.utils import get_fiscal_year from erpnext.accounts.utils import get_fiscal_year
<<<<<<< HEAD
fiscal_year = get_fiscal_year(fiscal_year='2021') 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', if not frappe.db.get_value('Tax Withholding Rate',
{'parent': 'TDS - 194 - Dividends - Individual', 'from_date': ('>=', fiscal_year[1]), {'parent': 'TDS - 194 - Dividends - Individual', 'from_date': ('>=', fiscal_year[1]),