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: add a new filter flag in Process Statement of Accounts (backport #42733) #42734

Merged
merged 4 commits into from
Aug 13, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 13, 2024

Ignore System Generated Credit / Debit Notes filter introduced by #42597 in General Ledger will be available in Process Statement of Accounts as well.


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

(cherry picked from commit 0cf478c)

# Conflicts:
#	erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#	erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
Copy link
Contributor Author

mergify bot commented Aug 13, 2024

Cherry-pick of 0cf478c has failed:

On branch mergify/bp/version-14-hotfix/pr-42733
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 0cf478c4c2.
  (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/process_statement_of_accounts/process_statement_of_accounts.json
	both modified:   erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.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 Aug 13, 2024
@ruthra-kumar ruthra-kumar merged commit a5b5b5e into version-14-hotfix Aug 13, 2024
10 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-14-hotfix/pr-42733 branch August 13, 2024 06:19
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 14.72.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 Aug 30, 2024
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. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants