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: gov compliance for tax withholding report (backport #37590) #37823

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 1, 2023

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

On branch mergify/bp/version-14-hotfix/pr-37590
Your branch is ahead of 'origin/version-14-hotfix' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ed2457bddf.
  (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/buying/doctype/supplier/supplier.json
	both modified:   erpnext/selling/doctype/customer/customer.json

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 7ecc0d5)
(cherry picked from commit 4471ad5)
(cherry picked from commit ed2457b)

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/selling/doctype/customer/customer.json
(cherry picked from commit 7544101)
@mergify mergify bot added the conflicts label Nov 1, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Nov 1, 2023
@deepeshgarg007 deepeshgarg007 merged commit 273cc35 into version-14-hotfix Nov 2, 2023
10 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-37590 branch November 2, 2023 09:04
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.47.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 Jan 14, 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.

3 participants