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

fix: Debug CI

Browse Source 
(cherry picked from commit 092d41ecda)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
This commit is contained in:
Deepesh Garg
2021-09-03 20:04:18 +05:30
committed by Mergify
parent 46f814d255
commit 06e19afe00
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1671,7 +1671,12 @@ 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(date=nowdate()) 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)
<<<<<<< HEAD <<<<<<< HEAD
if not frappe.db.get_value( if not frappe.db.get_value(