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: negative stock error while making stock reconciliation (backport #40016) #40025

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 22, 2024

This is an automatic backport of pull request #40016 done by Mergify.
Cherry-pick of da184d7 has failed:

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

You are currently cherry-picking commit da184d709b.
  (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/doctype/stock_reconciliation/stock_reconciliation.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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

fix: negative stock error while making stock reco
(cherry picked from commit da184d7)

# Conflicts:
#	erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@mergify mergify bot requested a review from rohitwaghchaure as a code owner February 22, 2024 03:55
@mergify mergify bot added the conflicts label Feb 22, 2024
@mergify mergify bot requested a review from s-aga-r as a code owner February 22, 2024 03:55
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Feb 22, 2024
@rohitwaghchaure rohitwaghchaure removed needs-tests This PR needs automated unit-tests. conflicts labels Feb 22, 2024
@rohitwaghchaure rohitwaghchaure merged commit 865cba4 into version-14-hotfix Feb 22, 2024
9 of 10 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-14-hotfix/pr-40016 branch February 22, 2024 06:09
@rohitwaghchaure
Copy link
Collaborator

@Mergifyio backport version-14

Copy link
Contributor Author

mergify bot commented Feb 22, 2024

backport version-14

✅ Backports have been created

mergify bot added a commit that referenced this pull request Feb 22, 2024
…40016) (#40025)

* fix: negative stock error while making stock reconciliation (#40016)

fix: negative stock error while making stock reco
(cherry picked from commit da184d7)

# Conflicts:
#	erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py

* chore: fix conflicts

* chore: fix linter issue

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 865cba4)
rohitwaghchaure added a commit that referenced this pull request Feb 22, 2024
fix: negative stock error while making stock reconciliation (backport #40016) (backport #40025)
frappe-pr-bot pushed a commit that referenced this pull request Feb 22, 2024
## [14.63.1](v14.63.0...v14.63.1) (2024-02-22)

### Bug Fixes

* negative stock error while making stock reconciliation (backport [#40016](#40016)) ([#40025](#40025)) ([7355fce](7355fce))
frappe-pr-bot pushed a commit that referenced this pull request Feb 28, 2024
# [14.64.0](v14.63.3...v14.64.0) (2024-02-28)

### Bug Fixes

* add flags for repost to ensure correct accounting from India Compliance App ([8c772cf](8c772cf))
* amount label according to party type ([bb3a7cd](bb3a7cd))
* Cannot read properties of undefined (backport [#40081](#40081)) ([#40082](#40082)) ([579b27d](579b27d))
* capacity planning issue in the job card (backport [#40092](#40092)) ([#40100](#40100)) ([8a573a1](8a573a1))
* check_credit_limit on_update_after_submit of Sales Order ([3112fca](3112fca))
* communication_date in party dashboards (backport [#40005](#40005)) ([#40020](#40020)) ([b364fe7](b364fe7))
* Completed Work Orders report not working ([c8e1409](c8e1409))
* Cr/Dr notes with POS Payments ([e5098c5](e5098c5))
* default taxable value for item not found in item list ([30315ab](30315ab))
* Delete linked asset movement record on cancellation of purchase receipt/invoice ([11bddc1](11bddc1))
* Delete orphaned asset movement item records ([46cd929](46cd929))
* delete PLE containing invoice in against ([08459ce](08459ce))
* do not make MR against raw materials of available sub assemblies (backport [#40085](#40085)) ([#40086](#40086)) ([e461185](e461185))
* incorrect item name in MR (backport [#40018](#40018)) ([#40023](#40023)) ([079ba76](079ba76))
* linter issue ([ea1a0b3](ea1a0b3))
* linting issue ([65a2adf](65a2adf))
* linting issue ([e289aef](e289aef))
* negative stock error while making stock reconciliation (backport [#40016](#40016)) ([#40025](#40025)) ([865cba4](865cba4))
* on unreconciliation, update advance paid ([fe88a11](fe88a11))
* only check for delinked PLEs ([3d243a7](3d243a7))
* only consider contributed qty towards achieved targets ([0484857](0484857))
* parent warehouse checks in the production plan for sub-assemblies (backport [#40150](#40150)) ([#40156](#40156)) ([9a85ab4](9a85ab4))
* remove cancelled payment entry from Payment Period Based On Invoice Date ([2fc490a](2fc490a))
* remove cancelled payment entry from PPBOID report ([a1c0c23](a1c0c23))
* remove config for default bank account in test ([ad60677](ad60677))
* sales funnel text color in light/dark theme ([#40132](#40132)) ([193cd0d](193cd0d))
* skip max discount validation for rate adjustment ([8c7d0d4](8c7d0d4))
* skip SO & DN validation for debit note ([882cf98](882cf98))
* test for plaid bank account validation ([22db6f6](22db6f6))
* timesheet per billed state edge case (backport [#40010](#40010)) ([#40028](#40028)) ([2a2f314](2a2f314))
* translatable columns in Sales Pipeline Analytics report ([3c170b9](3c170b9))
* unique gl account for plaid bank accounts ([8638d14](8638d14))
* use correct variable name for hotfix branches ([812eebf](812eebf))
* Webpages not working without login ([d6fad08](d6fad08))

### Features

* show contributed qty in transaction summary ([89d1942](89d1942))
* update billed amount in PO and PR ([019d8f9](019d8f9))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.64.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 Mar 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants