Skip to content

Commit

Permalink
Merge pull request #45029 from frappe/mergify/bp/version-14/pr-45026
Browse files Browse the repository at this point in the history
fix: slow stock transactions (backport #45025) (backport #45026)
  • Loading branch information
rohitwaghchaure authored Jan 1, 2025
2 parents 76ea858 + a85a103 commit 2a40845
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion erpnext/stock/stock_balance.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def get_balance_qty_from_sle(item_code, warehouse):
balance_qty = frappe.db.sql(
"""select qty_after_transaction from `tabStock Ledger Entry`
where item_code=%s and warehouse=%s and is_cancelled=0
order by posting_date desc, posting_time desc, creation desc
order by posting_datetime desc, creation desc
limit 1""",
(item_code, warehouse),
)
Expand Down
14 changes: 7 additions & 7 deletions erpnext/stock/stock_ledger.py
Original file line number Diff line number Diff line change
Expand Up @@ -1263,7 +1263,7 @@ def get_previous_sle_of_current_voucher(args, operator="<", exclude_current_vouc
and (
posting_datetime {operator} %(posting_datetime)s
)
order by posting_date desc, posting_time desc, creation desc
order by posting_datetime desc, creation desc
limit 1
for update""",
{
Expand Down Expand Up @@ -1357,7 +1357,7 @@ def get_stock_ledger_entries(
where item_code = %(item_code)s
and is_cancelled = 0
{conditions}
order by posting_date {order}, posting_time {order}, creation {order}
order by posting_datetime {order}, creation {order}
{limit} {for_update}""".format(
conditions=conditions,
limit=limit or "",
Expand Down Expand Up @@ -1462,7 +1462,7 @@ def get_valuation_rate(
AND valuation_rate >= 0
AND is_cancelled = 0
AND NOT (voucher_no = %s AND voucher_type = %s)
order by posting_date desc, posting_time desc, name desc limit 1""",
order by posting_datetime desc, creation desc limit 1""",
(item_code, warehouse, voucher_no, voucher_type),
)

Expand Down Expand Up @@ -1711,8 +1711,8 @@ def get_future_sle_with_negative_qty(sle):
& (SLE.is_cancelled == 0)
& (SLE.qty_after_transaction < 0)
)
.orderby(SLE.posting_date)
.orderby(SLE.posting_time)
.orderby(SLE.posting_datetime)
.orderby(SLE.creation)
.limit(1)
)

Expand All @@ -1728,14 +1728,14 @@ def get_future_sle_with_negative_batch_qty(args):
with batch_ledger as (
select
posting_date, posting_time, posting_datetime, voucher_type, voucher_no,
sum(actual_qty) over (order by posting_date, posting_time, creation) as cumulative_total
sum(actual_qty) over (order by posting_datetime, creation) as cumulative_total
from `tabStock Ledger Entry`
where
item_code = %(item_code)s
and warehouse = %(warehouse)s
and batch_no=%(batch_no)s
and is_cancelled = 0
order by posting_date, posting_time, creation
order by posting_datetime, creation
)
select * from batch_ledger
where
Expand Down

0 comments on commit 2a40845

Please sign in to comment.