Skip to content

fix: do not fetch a random inventory account when multiple inventory accounts exist (backport #57626) - #57632

Merged
rohitwaghchaure merged 2 commits into
version-16-hotfixfrom
mergify/bp/version-16-hotfix/pr-57626
Jul 30, 2026
Merged

fix: do not fetch a random inventory account when multiple inventory accounts exist (backport #57626)#57632
rohitwaghchaure merged 2 commits into
version-16-hotfixfrom
mergify/bp/version-16-hotfix/pr-57626

Conversation

@mergify

@mergify mergify Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

This is an automatic backport of pull request #57626 done by [Mergify](https://mergify.com).

…accounts exist (#57626)

(cherry picked from commit 386a4ac)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@mergify

mergify Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 386a4ac has failed:

On branch mergify/bp/version-16-hotfix/pr-57626
Your branch is up to date with 'origin/version-16-hotfix'.

You are currently cherry-picking commit 386a4ac1f0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/stock/__init__.py
	modified:   erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
	modified:   erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
	modified:   erpnext/stock/doctype/warehouse/test_warehouse.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions Bot added the stock label Jul 30, 2026
Remove redundant inter-company transaction tests and related setup.
@mergify

mergify Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor Author

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@rohitwaghchaure
rohitwaghchaure merged commit 34cbd3c into version-16-hotfix Jul 30, 2026
18 checks passed
@rohitwaghchaure
rohitwaghchaure deleted the mergify/bp/version-16-hotfix/pr-57626 branch July 30, 2026 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant