nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 03:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source 
(cherry picked from commit 31142b2f47)
This commit is contained in:
Diptanil Saha
2025-11-27 16:40:55 +05:30
committed by Mergify
parent 797b6937f2
commit cd7e9e48de
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/selling/page/point_of_sale/point_of_sale.py
View File

@@ -5,12 +5,8 @@
import json import json
import frappe import frappe
<<<<<<< HEAD
from frappe.utils import cint, get_datetime
=======
from frappe.query_builder import DocType, Order from frappe.query_builder import DocType, Order
from frappe.utils import cint from frappe.utils import cint, get_datetime
>>>>>>> dfda8e6241 (fix: item price not considering based on valid_upto)
from frappe.utils.nestedset import get_root_of from frappe.utils.nestedset import get_root_of
from erpnext.accounts.doctype.pos_invoice.pos_invoice import get_item_group, get_stock_availability from erpnext.accounts.doctype.pos_invoice.pos_invoice import get_item_group, get_stock_availability