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: payment entry is already created on posawesome. (backport #34712) #34753

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 5, 2023

This is an automatic backport of pull request #34712 done by Mergify.
Cherry-pick of 9bf87d7 has failed:

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

You are currently cherry-picking commit 9bf87d708e.
  (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/accounts/doctype/payment_request/payment_request.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/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 9bf87d7)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request.py
@mergify mergify bot added the conflicts label Apr 5, 2023
@deepeshgarg007 deepeshgarg007 merged commit b48fca3 into version-13-hotfix Apr 5, 2023
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-34712 branch April 5, 2023 08:26
deepeshgarg007 added a commit that referenced this pull request Apr 5, 2023
deepeshgarg007 added a commit that referenced this pull request Apr 5, 2023
Revert "fix: `payment entry is already created` on posawesome. (backport #34712) (#34753)"

This reverts commit b48fca3.
mergify bot pushed a commit that referenced this pull request Apr 5, 2023
Revert "fix: `payment entry is already created` on posawesome. (backport #34712) (#34753)"

This reverts commit b48fca3.

(cherry picked from commit 034e35e)
deepeshgarg007 added a commit that referenced this pull request Apr 5, 2023
…ort #34712)" (backport #34756) (#34757)

Revert "fix: `payment entry is already created` on posawesome. (#34712)"

Revert "fix: `payment entry is already created` on posawesome. (backport #34712) (#34753)"

This reverts commit b48fca3.

(cherry picked from commit 034e35e)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Apr 5, 2023
## [13.49.11](v13.49.10...v13.49.11) (2023-04-05)

### Reverts

* Revert "fix: `payment entry is already created` on posawesome. (backport #34712)" (backport #34756) (#34757) ([98de1f2](98de1f2)), closes [#34712](#34712) [#34756](#34756) [#34757](#34757) [#34712](#34712) [#34712](#34712) [#34753](#34753)
frappe-pr-bot pushed a commit that referenced this pull request Apr 11, 2023
## [13.49.12](v13.49.11...v13.49.12) (2023-04-11)

### Bug Fixes

* `payment entry is already created` on posawesome. (backport [#34712](#34712)) ([#34753](#34753)) ([b48fca3](b48fca3))
* Allocate tax loss to tax account head on early payment discount ([#34287](#34287)) ([92a26dd](92a26dd))
* asset monthly WDV and DD schedule [v13] ([#34645](#34645)) ([fed43ae](fed43ae))
* BOM Update Cost, when no actual qty ([9725698](9725698))
* bom update log not working for large batch size ([9cf30d7](9cf30d7))
* don't include cancelled JVs in assdeprledger report ([#34737](#34737)) ([3007ac3](3007ac3))
* enclose ternary operator in parentheses ([198830a](198830a))
* filter out old allocation's cf leaves while fetching leave details ([#34723](#34723)) ([50de045](50de045))
* format currency/float as per number format in work history ([#34545](#34545)) ([892c480](892c480))
* incorrect arg name in asset value adjustment ([545807a](545807a))
* incorrect balance qty in the stock ledger report ([dab1f1a](dab1f1a))
* Item tax validity comparison fixes ([#34784](#34784)) ([71bafab](71bafab))
* lost opportunity report issue ([#34626](#34626)) ([ab06cb4](ab06cb4))
* posting time issue ([f22e777](f22e777))
* provide filter by depreciable assets in fixed asset register ([#34803](#34803)) ([8609bf4](8609bf4))
* serial no with zero quantity issue in stock reco ([46638b1](46638b1))
* Shop by category fixes (backport [#34688](#34688)) ([#34751](#34751)) ([af828e4](af828e4))

### Reverts

* Revert "fix: `payment entry is already created` on posawesome. (#34712)" ([034e35e](034e35e)), closes [#34712](#34712) [#34712](#34712) [#34753](#34753)
* remove frappe.send_message (v13) ([#34820](#34820)) ([77f1322](77f1322)), closes [#34816](#34816)
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.49.12 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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

3 participants