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

feat: Payment reconciliation on accounts module workspace (backport #25925) #43142

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 10, 2024

Makes payment reconciliation more accessible by default.
closes #25788

image

no-docs


This is an automatic backport of pull request #25925 done by Mergify.

* feat: add payment reconciliation to accounting workspace

* fix: update modified and duplicate the link

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit 072151e)

# Conflicts:
#	erpnext/accounts/workspace/accounting/accounting.json
Copy link
Contributor Author

mergify bot commented Sep 10, 2024

Cherry-pick of 072151e has failed:

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

You are currently cherry-picking commit 072151e16d.
  (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/workspace/accounting/accounting.json

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 mergify bot deleted the mergify/bp/version-13-hotfix/pr-25925 branch September 10, 2024 10:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants