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(pe): show split alert only on splitting (backport #38440) #38486

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 1, 2023

This is an automatic backport of pull request #38440 done by Mergify.
Cherry-pick of 96b13c5 has failed:

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

You are currently cherry-picking commit 96b13c59c1.
  (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_entry/payment_entry.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 96b13c5)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
@mergify mergify bot added the conflicts label Dec 1, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Dec 1, 2023
@ruthra-kumar
Copy link
Member

#37859 is not yet backported to v15

@marination
Copy link
Collaborator

@ruthra-kumar #38488 ported

@barredterra
Copy link
Collaborator

@Mergifyio update

@frappe frappe deleted a comment from mergify bot Dec 15, 2023
Copy link
Contributor Author

mergify bot commented Dec 15, 2023

update

☑️ Nothing to do

  • -conflict [:pushpin: update requirement]
  • #commits-behind>0 [:pushpin: update requirement]
  • -closed [:pushpin: update requirement]

@barredterra barredterra deleted the mergify/bp/version-15-hotfix/pr-38440 branch December 15, 2023 14:32
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 30, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflicts needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants