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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-12-07 11:46:04 +05:30
committed by GitHub
parent 4b218bcf9e
commit 75253b9932
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py
View File

@@ -3,11 +3,7 @@
import frappe import frappe
from frappe.custom.doctype.custom_field.custom_field import create_custom_field from frappe.custom.doctype.custom_field.custom_field import create_custom_field
<<<<<<< HEAD from frappe.tests.utils import FrappeTestCase, change_settings
from frappe.tests.utils import FrappeTestCase
=======
from frappe.tests import IntegrationTestCase, change_settings
>>>>>>> 1e2c56874f (test: validate negative stock with multiple inventory dimensions)
from frappe.utils import nowdate, nowtime from frappe.utils import nowdate, nowtime
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note