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

fix: conflicts

Browse Source
This commit is contained in:
Sagar Vora
2025-06-10 13:05:37 +05:30
parent 9167d2ef64
commit aa29c5dde2
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/stock/utils.py
View File

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