Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: barcode not fetched on selection of item (backport #40814) #41027

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 16, 2024

On selection of the item in the stock entry, system not fetch the barcode


This is an automatic backport of pull request #40814 done by Mergify.

(cherry picked from commit b073029)

# Conflicts:
#	erpnext/stock/get_item_details.py
Copy link
Contributor Author

mergify bot commented Apr 16, 2024

Cherry-pick of b073029 has failed:

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

You are currently cherry-picking commit b0730293e2.
  (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/doctype/item/test_item.py
	modified:   erpnext/stock/doctype/stock_entry/stock_entry.py
	modified:   erpnext/stock/doctype/stock_entry/test_stock_entry.py
	modified:   erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/get_item_details.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

@rohitwaghchaure rohitwaghchaure merged commit 0bee921 into version-14-hotfix Apr 16, 2024
10 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-14-hotfix/pr-40814 branch April 16, 2024 08:52
frappe-pr-bot pushed a commit that referenced this pull request Apr 17, 2024
## [14.67.2](v14.67.1...v14.67.2) (2024-04-17)

### Bug Fixes

* barcode not fetched on selection of item (backport [#40814](#40814)) ([#41027](#41027)) ([0bee921](0bee921))
* Delayed Order Report not working (backport [#41037](#41037)) ([#41038](#41038)) ([e956dbb](e956dbb))
* Don't call get_fiscal_year if setup is not done yet ([59cea9f](59cea9f))
* Don't set delivery date as today while making SO from Quotation ([b47e224](b47e224))
* exclude some query builder lines from ruff rules ([2425119](2425119))
* expense account set as COGS for stock entry Material Issue (backport [#41026](#41026)) ([#41028](#41028)) ([153e0ba](153e0ba))
* get address if multiple companies ([c2b6b64](c2b6b64))
* get address if multiple companies ([0493872](0493872))
* **gp:** SLEs not fetched for correct warehouse ([97e7b3f](97e7b3f))
* incorrect exc gain/loss for PE against JE for payable accounts ([50a74ee](50a74ee))
* Resolve merge conflicts ([cc925ae](cc925ae))
* Subcontracting Receipt GL Entries (backport [#40773](#40773)) ([#40978](#40978)) ([c2c4548](c2c4548))
* test cases ([79e23da](79e23da))
* **treewide:** manual ruff fixes ([b087fb3](b087fb3))
* use 'eq' and isnull() on qb conditions ([b4ed2d2](b4ed2d2))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.67.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants