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: do not allow to cancel incomplete reposting (backport #40224) #40229

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 2, 2024

This is an automatic backport of pull request #40224 done by Mergify.
Cherry-pick of 72ac56b has failed:

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

You are currently cherry-picking commit 72ac56b6c4.
  (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/repost_item_valuation/repost_item_valuation.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

(cherry picked from commit 72ac56b)

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
@mergify mergify bot requested a review from rohitwaghchaure as a code owner March 2, 2024 07:31
@mergify mergify bot added the conflicts label Mar 2, 2024
@mergify mergify bot requested a review from s-aga-r as a code owner March 2, 2024 07:31
Copy link
Contributor Author

mergify bot commented Mar 2, 2024

Cherry-pick of 72ac56b has failed:

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

You are currently cherry-picking commit 72ac56b6c4.
  (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/repost_item_valuation/repost_item_valuation.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 the needs-tests This PR needs automated unit-tests. label Mar 2, 2024
@rohitwaghchaure rohitwaghchaure merged commit 091d6f3 into version-14-hotfix Mar 4, 2024
10 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-14-hotfix/pr-40224 branch March 4, 2024 07:44
frappe-pr-bot pushed a commit that referenced this pull request Mar 6, 2024
# [14.65.0](v14.64.0...v14.65.0) (2024-03-06)

### Bug Fixes

* account validation error on bank account after editing existing bank account ([8b3c809](8b3c809))
* allow gain/loss for Journals against Journals ([52e1c2f](52e1c2f))
* do not allow to cancel incomplete reposting (backport [#40224](#40224)) ([#40229](#40229)) ([091d6f3](091d6f3))
* don't override reference exchange rate ([e25ec41](e25ec41))
* handle partial invoice against provisional entry ([5f23614](5f23614))
* incorrect exchange rate if JE has multi parties ([1b5a237](1b5a237))
* incorrect TCS on customer and suppliers with same name ([af56846](af56846))
* make use of 'flt' to prevent really low precision exc gain/loss ([c1a0ac6](c1a0ac6))
* make warning for previously existing SO an alert ([c8b817c](c8b817c))
* over billing qty along with rate ([14d9d29](14d9d29))
* **Project:** filter department by company ([646b55e](646b55e))
* provisional reverse entry amount ([e62c49d](e62c49d))
* rate change on changing of the qty (backport [#40241](#40241)) ([#40242](#40242)) ([b937c4b](b937c4b))
* **setup:** avoid duplicate entry for Analytics role (backport [#40183](#40183)) ([#40184](#40184)) ([035c90c](035c90c))

### Features

* add company filter to child table field ([38baf8d](38baf8d))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.65.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 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants