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: Updates in process statement of Accounts (backport #35064) #35113

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 1, 2023

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

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

You are currently cherry-picking commit ea0b03ae9e.
  (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/doctype/process_statement_of_accounts/process_statement_of_accounts.html
	modified:   erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
	modified:   erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json

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

# Conflicts:
#	erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
@mergify mergify bot added the conflicts label May 1, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label May 1, 2023
@deepeshgarg007 deepeshgarg007 merged commit bef9dd7 into version-14-hotfix May 2, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-35064 branch May 2, 2023 17:37
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.23.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 13, 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