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: Is Reverse Charge check in Tax Category (backport #28935) #28978

Merged
merged 5 commits into from
Dec 26, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 21, 2021

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

On branch mergify/bp/develop/pr-28935
Your branch is up to date with 'origin/develop'.

You are currently cherry-picking commit b33fd6acc7.
  (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:
	new file:   erpnext/patches/v13_0/update_tax_category_for_rcm.py
	modified:   erpnext/regional/india/setup.py
	modified:   erpnext/regional/india/utils.py

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

Cherry-pick of 7c1bfe6 has failed:

On branch mergify/bp/develop/pr-28935
Your branch is ahead of 'origin/develop' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 7c1bfe6b46.
  (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/patches.txt

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

# Conflicts:
#	erpnext/patches.txt
(cherry picked from commit 7c1bfe6)

# Conflicts:
#	erpnext/patches.txt
@deepeshgarg007 deepeshgarg007 merged commit 44407e6 into develop Dec 26, 2021
@mergify mergify bot deleted the mergify/bp/develop/pr-28935 branch December 26, 2021 06:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant