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: root type in account map for balance sheet (backport #36303) #36431

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 31, 2023

This is an automatic backport of pull request #36303 done by Mergify.
Cherry-pick of 11bd15e has failed:

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

You are currently cherry-picking commit 11bd15e580.
  (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)

Changes to be committed:
	modified:   erpnext/accounts/report/financial_statements.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py

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

* fix: root type in account map

* fix: fetch gle by root type in consolidated financial statement

* refactor: consolidated financial statement gle query

* fix: filter accounts by root type

(cherry picked from commit 11bd15e)

# Conflicts:
#	erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
@mergify mergify bot added the conflicts label Jul 31, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jul 31, 2023
@deepeshgarg007 deepeshgarg007 merged commit 5b56296 into version-14-hotfix Aug 1, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-36303 branch August 1, 2023 04:45
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.33.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 Feb 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants