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

refactor: Allow equity type Account in Payment Entry for shareholders (backport #42851) #42868

Merged
merged 3 commits into from
Aug 22, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 22, 2024

Screenshot 2024-08-21 at 2 21 08 PM
This is an automatic backport of pull request #42851 done by [Mergify](https://mergify.com).

(cherry picked from commit 6cbf982)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.js
(cherry picked from commit 63ad9f4)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.js
@mergify mergify bot requested a review from deepeshgarg007 as a code owner August 22, 2024 11:40
@mergify mergify bot added the conflicts label Aug 22, 2024
@mergify mergify bot requested a review from ruthra-kumar as a code owner August 22, 2024 11:40
Copy link
Contributor Author

mergify bot commented Aug 22, 2024

Cherry-pick of 6cbf982 has failed:

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

You are currently cherry-picking commit 6cbf98294a.
  (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.js

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 63ad9f4 has failed:

On branch mergify/bp/version-14-hotfix/pr-42851
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 63ad9f4f86.
  (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.js

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

@ruthra-kumar ruthra-kumar merged commit dffd5f2 into version-14-hotfix Aug 22, 2024
5 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-14-hotfix/pr-42851 branch August 22, 2024 12:20
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 14.73.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 Sep 17, 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