fix: conflicts

This commit is contained in:
Sagar Vora
2025-06-10 13:05:37 +05:30
parent 9167d2ef64
commit aa29c5dde2

View File

@@ -109,11 +109,8 @@ def get_stock_balance(
from erpnext.stock.stock_ledger import get_previous_sle
<<<<<<< HEAD
=======
frappe.has_permission("Item", "read", throw=True)
>>>>>>> 8b6a8d0c4f (fix: throw permission error (#47976))
if posting_date is None:
posting_date = nowdate()
if posting_time is None: