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: accepted warehouse and rejected warehouse can't be same (backport #36973) #37071

Merged
merged 3 commits into from
Sep 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 13, 2023

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

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

You are currently cherry-picking commit d2f3286115.
  (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/buying/doctype/purchase_order/purchase_order.json
	both modified:   erpnext/buying/doctype/purchase_order_item/purchase_order_item.json

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/github/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

(cherry picked from commit d2f3286)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@s-aga-r s-aga-r removed the conflicts label Sep 13, 2023
@s-aga-r s-aga-r enabled auto-merge (squash) September 13, 2023 11:04
@s-aga-r s-aga-r merged commit b56c9b9 into version-14-hotfix Sep 13, 2023
10 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-36973 branch September 13, 2023 11:26
frappe-pr-bot pushed a commit that referenced this pull request Sep 20, 2023
# [14.40.0](v14.39.0...v14.40.0) (2023-09-20)

### Bug Fixes

* + btn not appearing for delivery note connection (backport [#36980](#36980)) ([#37070](#37070)) ([c2a0c1e](c2a0c1e))
* accepted warehouse and rejected warehouse can't be same (backport [#36973](#36973)) ([#37071](#37071)) ([b56c9b9](b56c9b9))
* after applying coupon code, field in_words not updated ([#37133](#37133)) ([1cb8c64](1cb8c64))
* Apply dimension filter, irrespective of dimesion columns ([9bc44a3](9bc44a3))
* asset validation misfire on debit notes ([b33db6c](b33db6c))
* company wise deferred accounting fields in item ([#37023](#37023)) ([13aaff3](13aaff3))
* Don't allow merging accounts with different currency ([#37074](#37074)) ([c41cb39](c41cb39))
* don't set from warehouse for purchase material request ([#37132](#37132)) ([e62b783](e62b783))
* Duplicate Serial Nos validation in POS ([#36927](#36927)) ([366325c](366325c))
* fetch logic for repay_from_salary in loan_repayment [v14] ([#37135](#37135)) ([480a0ca](480a0ca))
* ignore user permissions for `Source Warehouse` in MR (backport [#37102](#37102)) ([#37110](#37110)) ([727dcc5](727dcc5))
* incorrect stock ledger entries in DN (backport [#36944](#36944)) ([#37066](#37066)) ([699ad80](699ad80))
* packed item using expired price ([413b40f](413b40f))
* POS opening Issue if Product Bundle is available ([#37138](#37138)) ([af05864](af05864))
* precision issue and column name ([#37073](#37073)) ([f2395a9](f2395a9))
* Purchase Receipt Provisional Accounting GL Entries (backport [#37046](#37046)) ([#37068](#37068)) ([8772e40](8772e40))
* Remove redundant code ([#37001](#37001)) ([3ecdf02](3ecdf02))
* **ux:** move `get_route_options_for_new_doc` to `refresh` ([#37092](#37092)) ([a563fed](a563fed))
* validate duplicate serial no in DN ([fffa13f](fffa13f))

### Features

* provision to create RIV from `Stock Ledger Invariant Check` report (backport [#37115](#37115)) ([#37147](#37147)) ([29ff0ce](29ff0ce))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.40.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 Jan 29, 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