fix: sort available batches based on expiry when merging SLEs with SABB and those without by mihir-kandoi [frappe] PR#48471 (!6710) · Merge requests · Dokos / Dokos · GitLab

From: https://github.com/frappe/erpnext/pull/48471
Date: 2025-07-08 19:31:03+05:30

fix: test case
fix: sort available batches based on expiry

Diagnostics

pre-commit failed for source commit: 5c665c562a61194fe348a696513c7901ca381f47
erpnext/stock/doctype/batch/test_batch.py:121:7: B020 Loop control variable `receipt` overrides iterable it iterates
Found 1 error.

Checkout instructions

# Checkout locally
git fetch upstream
git switch ft-pr-48471

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-48471

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease