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) #40230

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-15-hotfix/pr-40224
Your branch is up to date with 'origin/version-15-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-15-hotfix/pr-40224
Your branch is up to date with 'origin/version-15-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 removed needs-tests This PR needs automated unit-tests. conflicts labels Mar 2, 2024
@rohitwaghchaure rohitwaghchaure merged commit 63209f4 into version-15-hotfix Mar 4, 2024
11 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-15-hotfix/pr-40224 branch March 4, 2024 07:44
frappe-pr-bot pushed a commit that referenced this pull request Mar 6, 2024
# [15.16.0](v15.15.0...v15.16.0) (2024-03-06)

### Bug Fixes

* allow editable accounting dimensions for repostable doctypes ([cd24a2a](cd24a2a))
* allow gain/loss for Journals against Journals ([d8cf6ba](d8cf6ba))
* check child rows before update ([e20c1ac](e20c1ac))
* disable editable account heads ([c55c0f7](c55c0f7))
* do not allow to cancel incomplete reposting (backport [#40224](#40224)) ([#40230](#40230)) ([63209f4](63209f4))
* don't override reference exchange rate ([4513d83](4513d83))
* handle partial invoice against provisional entry ([87596e6](87596e6))
* ignore self on GL account validation for Bank Account ([1947a67](1947a67))
* include Debit To/Credit To account while fetching advance ([23d7a1f](23d7a1f))
* incorrect exchange rate if JE has multi parties ([b785901](b785901))
* incorrect TCS on customer and suppliers with same name ([d74647d](d74647d))
* make use of 'flt' to prevent really low precision exc gain/loss ([9057bff](9057bff))
* make warning for previously existing SO an alert ([4f9b194](4f9b194))
* over billing qty along with rate ([00d410c](00d410c))
* **Project:** filter department by company ([13e3343](13e3343))
* provisional reverse entry amount ([0182b95](0182b95))
* rate change on changing of the qty (backport [#40241](#40241)) ([#40243](#40243)) ([1d42171](1d42171))
* remove free item row only if pricing rule matches ([6352bfe](6352bfe))
* report path from the Item and Putaway Rule list (backport [#40190](#40190)) ([#40266](#40266)) ([c7b96df](c7b96df))
* serial no valuation rate (backport [#40221](#40221)) ([#40223](#40223)) ([85ae9ee](85ae9ee))
* **setup:** avoid duplicate entry for Analytics role (backport [#40183](#40183)) ([#40185](#40185)) ([9cb8d33](9cb8d33))
* test for repost accounting in JVs ([1634955](1634955))
* test for reposting pi ([6230bbc](6230bbc))
* uom wise price in sales or purchase transaction (backport [#40216](#40216)) ([#40225](#40225)) ([b398cc6](b398cc6))

### Features

* add company filter to child table field ([0ede99b](0ede99b))
* add patch for making repostable dimension fields editable ([4b57126](4b57126))
* allow on submit for selected fields ([6c3b5bb](6c3b5bb))
* repost ledger button in JV ([e5eeb21](e5eeb21))
* update after submit in JV ([cdab3fa](cdab3fa))
* validate before allowing repost ([8585cfc](8585cfc))

### Performance Improvements

* serial and batch bundle valuation (reposting) (backport [#40255](#40255)) ([#40262](#40262)) ([93f3af7](93f3af7))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.16.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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants