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

chore: resolve conflict

Browse Source
This commit is contained in:
Diptanil Saha
2025-11-12 11:35:02 +05:30
committed by GitHub
parent 650d2f74ba
commit af19b81343
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/pos_profile/test_pos_profile.py
View File

@@ -4,11 +4,7 @@
import unittest import unittest
import frappe import frappe
<<<<<<< HEAD
=======
from frappe.tests import IntegrationTestCase
from frappe.utils import cint from frappe.utils import cint
>>>>>>> 69016a284f (test: added test to validate disabled pos profile)
from erpnext.accounts.doctype.pos_profile.pos_profile import ( from erpnext.accounts.doctype.pos_profile.pos_profile import (
get_child_nodes, get_child_nodes,