mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-25 06:02:09 +01:00
Merge pull request #53600 from frappe/mergify/bp/version-15-hotfix/pr-53599
fix: incorrect sle calculation when doc has project (backport #53599)
This commit is contained in:
@@ -686,6 +686,7 @@ def get_opening_balance(filters, columns, sl_entries, inv_dimension_wise_value=N
|
||||
"posting_time": "00:00:00",
|
||||
"project": project,
|
||||
},
|
||||
for_report=True,
|
||||
)
|
||||
|
||||
# check if any SLEs are actually Opening Stock Reconciliation
|
||||
|
||||
@@ -1766,7 +1766,7 @@ def get_previous_sle_of_current_voucher(args, operator="<", exclude_current_vouc
|
||||
return sle[0] if sle else frappe._dict()
|
||||
|
||||
|
||||
def get_previous_sle(args, for_update=False, extra_cond=None):
|
||||
def get_previous_sle(args, for_update=False, extra_cond=None, for_report=False):
|
||||
"""
|
||||
get the last sle on or before the current time-bucket,
|
||||
to get actual qty before transaction, this function
|
||||
@@ -1782,7 +1782,7 @@ def get_previous_sle(args, for_update=False, extra_cond=None):
|
||||
"""
|
||||
args["name"] = args.get("sle", None) or ""
|
||||
sle = get_stock_ledger_entries(
|
||||
args, "<=", "desc", "limit 1", for_update=for_update, extra_cond=extra_cond
|
||||
args, "<=", "desc", "limit 1", for_update=for_update, extra_cond=extra_cond, for_report=for_report
|
||||
)
|
||||
return sle and sle[0] or {}
|
||||
|
||||
@@ -1796,6 +1796,7 @@ def get_stock_ledger_entries(
|
||||
debug=False,
|
||||
check_serial_no=True,
|
||||
extra_cond=None,
|
||||
for_report=False,
|
||||
):
|
||||
"""get stock ledger entries filtered by specific posting datetime conditions"""
|
||||
conditions = f" and posting_datetime {operator} %(posting_datetime)s"
|
||||
@@ -1850,7 +1851,7 @@ def get_stock_ledger_entries(
|
||||
if extra_cond:
|
||||
conditions += f"{extra_cond}"
|
||||
|
||||
if previous_sle.get("project"):
|
||||
if for_report and previous_sle.get("project"):
|
||||
conditions += " and project = %(project)s"
|
||||
|
||||
# nosemgrep
|
||||
|
||||
Reference in New Issue
Block a user