nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ljain112
2026-03-31 11:05:46 +05:30
parent 5922d25210
commit 0dcacad793
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/controllers/tests/test_item_wise_tax_details.py
View File

@@ -2,12 +2,7 @@ import json
import frappe import frappe
<<<<<<< HEAD
from erpnext.controllers.taxes_and_totals import calculate_taxes_and_totals
from erpnext.tests.utils import ERPNextTestSuite
=======
from erpnext.tests.utils import ERPNextTestSuite, change_settings from erpnext.tests.utils import ERPNextTestSuite, change_settings
>>>>>>> fc8437c499 (test: update item-wise tax detail test for high conversion rates)
class TestTaxesAndTotals(ERPNextTestSuite): class TestTaxesAndTotals(ERPNextTestSuite):