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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-02-07 13:18:42 +05:30
parent 3734289983
commit 43d75b96c6
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
View File

@@ -6,13 +6,8 @@ import unittest
import frappe import frappe
from frappe.custom.doctype.custom_field.custom_field import create_custom_fields from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
<<<<<<< HEAD
from frappe.tests.utils import FrappeTestCase, change_settings from frappe.tests.utils import FrappeTestCase, change_settings
from frappe.utils import add_days, today
=======
from frappe.tests import IntegrationTestCase, UnitTestCase
from frappe.utils import add_days, add_months, today from frappe.utils import add_days, add_months, today
>>>>>>> 0cdd346f8f (test: ldc @ 0 rate)
from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
from erpnext.accounts.utils import get_fiscal_year from erpnext.accounts.utils import get_fiscal_year