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: warning message for negative stock (backport #42683) #42709

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 11, 2024


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

(cherry picked from commit deccb00)

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

mergify bot commented Aug 11, 2024

Cherry-pick of deccb00 has failed:

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

You are currently cherry-picking commit deccb007c1.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/stock_ledger.py

no changes added to commit (use "git add" and/or "git commit -a")

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 needs-tests This PR needs automated unit-tests. stock labels Aug 11, 2024
@rohitwaghchaure rohitwaghchaure removed needs-tests This PR needs automated unit-tests. conflicts labels Aug 11, 2024
@rohitwaghchaure rohitwaghchaure merged commit e44daf7 into version-14-hotfix Aug 12, 2024
10 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-14-hotfix/pr-42683 branch August 12, 2024 05:50
frappe-pr-bot pushed a commit that referenced this pull request Aug 14, 2024
# [14.72.0](v14.71.0...v14.72.0) (2024-08-14)

### Bug Fixes

* dimensions in common party journal entry ([b73df8f](b73df8f))
* expense causing p&l test case to fail ([a9fa9e8](a9fa9e8))
* force fetch updates for subcription ([f35bc43](f35bc43))
* german translation of exit ([db27dd8](db27dd8))
* ledger entries for pos return with update outstanding for self ([714a432](714a432))
* Maintain same rate on qty change on Quotation to Sales Order ([29449cb](29449cb))
* missing def expense if no exp in first month ([7cd6deb](7cd6deb))
* patch to fix incorrect against_voucher references in ledger ([5473546](5473546))
* pre-commit for better code formatting ([8f19832](8f19832))
* Sort lists before calling itertools.groupby ([29cfb7c](29cfb7c))
* test case for zero deferred expense ([186701b](186701b))
* text color in sales funnel report based on theme ([2509618](2509618))
* typeerror on payment entry ([c4c001b](c4c001b))
* update 'Paid Amount' on forex payment request ([365ef6b](365ef6b))
* warning message for negative stock (backport [#42683](#42683)) ([#42709](#42709)) ([e44daf7](e44daf7))

### Features

* changes in opportunity.py to show contacts and addresses from referenced and opportunities ([8d7e150](8d7e150))
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 14.72.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 30, 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.

2 participants