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(regional): item wise tax calc issue (backport #36797) #38314

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 24, 2023

This is an automatic backport of pull request #36797 done by Mergify.
Cherry-pick of 89ddf32 has failed:

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

You are currently cherry-picking commit 89ddf3272e.
  (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/accounts/utils.py
	both modified:   erpnext/regional/united_arab_emirates/utils.py

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 89ddf32)

# Conflicts:
#	erpnext/accounts/utils.py
#	erpnext/regional/united_arab_emirates/utils.py
@mergify mergify bot requested a review from deepeshgarg007 as a code owner November 24, 2023 04:28
@mergify mergify bot added the conflicts label Nov 24, 2023
@mergify mergify bot requested a review from ruthra-kumar as a code owner November 24, 2023 04:28
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-36797 branch November 24, 2023 11:02
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants