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

perf(minor): general ledger report (backport #27987) #28355

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 11, 2021

This is an automatic backport of pull request #27987 done by Mergify.
Cherry-pick of ecbe4b1 has failed:

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

You are currently cherry-picking commit ecbe4b16b8.
  (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/report/general_ledger/general_ledger.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 ecbe4b1)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.py
@nextchamp-saqib nextchamp-saqib merged commit 11f4e1c into version-13-hotfix Nov 15, 2021
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-27987 branch November 15, 2021 08:20
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 4, 2025
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.

1 participant