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: Correct Tax Breakup for different tax rates for same hsn code (backport #36235) #36284

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 24, 2023

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

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

You are currently cherry-picking commit b84deec601.
  (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/templates/includes/itemised_tax_breakup.html

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

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

# Conflicts:
#	erpnext/controllers/taxes_and_totals.py
(cherry picked from commit 6f376cf)
@sagarvora
Copy link
Collaborator

Manually backported in #36286

@sagarvora sagarvora closed this Jul 25, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-36235 branch July 25, 2023 06:05
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 15, 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