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

fix: Test Case

Browse Source 
(cherry picked from commit c33bbd4f39)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
This commit is contained in:
Deepesh Garg
2021-09-09 11:13:29 +05:30
committed by Mergify
parent 0303c62a8a
commit 981c25375f
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1692,8 +1692,12 @@ def update_tax_witholding_category(company, account):
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='_Test Fiscal Year 2021') fiscal_year = get_fiscal_year(fiscal_year='_Test Fiscal Year 2021')
>>>>>>> 51d9572fe7 (fix: Hardcode fiscal year and posting date) >>>>>>> 51d9572fe7 (fix: Hardcode fiscal year and posting date)
=======
fiscal_year = get_fiscal_year(fiscal_year='2021')
>>>>>>> c33bbd4f39 (fix: Test Case)
<<<<<<< HEAD <<<<<<< HEAD
if not frappe.db.get_value( if not frappe.db.get_value(
@@ -1722,6 +1726,8 @@ def update_tax_witholding_category(company, account):
{'parent': 'TDS - 194 - Dividends - Individual', 'from_date': ('>=', fiscal_year[1]), {'parent': 'TDS - 194 - Dividends - Individual', 'from_date': ('>=', fiscal_year[1]),
'to_date': ('<=', fiscal_year[2])}): 'to_date': ('<=', fiscal_year[2])}):
tds_category = frappe.get_doc('Tax Withholding Category', 'TDS - 194 - Dividends - Individual') tds_category = frappe.get_doc('Tax Withholding Category', 'TDS - 194 - Dividends - Individual')
tds_category.set('rates', [])
tds_category.append('rates', { tds_category.append('rates', {
'from_date': fiscal_year[1], 'from_date': fiscal_year[1],
'to_date': fiscal_year[2], 'to_date': fiscal_year[2],