test: Pass ConflictingTaxRule during tax rule test
This commit is contained in:
parent
8696580254
commit
175cb27bcb
@ -7,7 +7,7 @@ import frappe
|
||||
from frappe.utils import nowdate, add_months
|
||||
from erpnext.shopping_cart.cart import _get_cart_quotation, update_cart, get_party
|
||||
from erpnext.tests.utils import create_test_contact_and_address
|
||||
|
||||
from erpnext.accounts.doctype.tax_rule.tax_rule import ConflictingTaxRule
|
||||
|
||||
# test_dependencies = ['Payment Terms Template']
|
||||
|
||||
@ -125,7 +125,7 @@ class TestShoppingCart(unittest.TestCase):
|
||||
tax_rule = frappe.get_test_records("Tax Rule")[0]
|
||||
try:
|
||||
frappe.get_doc(tax_rule).insert()
|
||||
except frappe.DuplicateEntryError:
|
||||
except (frappe.DuplicateEntryError, ConflictingTaxRule):
|
||||
pass
|
||||
|
||||
def create_quotation(self):
|
||||
|
Loading…
x
Reference in New Issue
Block a user