From eed5969c28c33af0091038a48037a38efa164c60 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Mon, 31 Aug 2026 17:08:48 +0530 Subject: [PATCH] chore: resolve conflicts --- .../test_opening_invoice_creation_tool.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py b/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py index 6fca0ce6d70..fedc705d193 100644 --- a/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py +++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py @@ -5,14 +5,11 @@ import frappe from frappe.tests.utils import FrappeTestCase from frappe.utils import add_days, today -<<<<<<< HEAD +from erpnext.accounts.doctype.account.test_account import create_account from erpnext.accounts.doctype.accounting_dimension.test_accounting_dimension import ( create_dimension, disable_dimension, ) -======= -from erpnext.accounts.doctype.account.test_account import create_account ->>>>>>> e08a166 (fix(taxes): skip tax addition for invoice created from opening invoice tool) from erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_creation_tool import ( get_temporary_opening_account, )