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: Account balance patch and query fixes (backport #36117) #36118

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 14, 2023

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

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

You are currently cherry-picking commit b4bd978791.
  (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/trial_balance/trial_balance.py
	modified:   erpnext/patches/v14_0/update_closing_balances.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt

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 b4bd978)

# Conflicts:
#	erpnext/patches.txt
@mergify mergify bot added the conflicts label Jul 14, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jul 14, 2023
@deepeshgarg007 deepeshgarg007 merged commit 0147754 into version-14-hotfix Jul 14, 2023
@deepeshgarg007
Copy link
Member

@Mergifyio backport version-14-hotfix

@mergify
Copy link
Contributor Author

mergify bot commented Jul 14, 2023

backport version-14-hotfix

✅ Backports have been created

  • Backport to branch version-14-hotfix not needed, change already in branch version-14-hotfix

@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-36117 branch July 14, 2023 05:11
@deepeshgarg007
Copy link
Member

@Mergifyio backport version-14

@mergify
Copy link
Contributor Author

mergify bot commented Jul 14, 2023

backport version-14

✅ Backports have been created

@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.31.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 16, 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.

2 participants