mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-21 02:16:28 +00:00
fix: conflicts
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user