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

chore: resolve conflicts

Browse Source
This commit is contained in:
ljain112
2026-08-31 17:08:48 +05:30
parent ae01c21614
commit eed5969c28
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py
View File

@@ -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,
)