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: set empty value for tax template in item details (backport #37496) #37622

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 21, 2023

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

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

You are currently cherry-picking commit b0d440c34b.
  (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/sales_invoice/test_sales_invoice.py
	modified:   erpnext/stock/doctype/item/test_item.py
	modified:   erpnext/stock/get_item_details.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/pos_invoice/test_pos_invoice.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

* fix: empty tax template for items with invalid templates

* fix: test for empty tax template

* fix: test for item tax template calculation

* fix: test for pos inv tax template calculation

(cherry picked from commit b0d440c)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
@deepeshgarg007 deepeshgarg007 merged commit ec208b8 into version-14-hotfix Oct 23, 2023
9 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-37496 branch October 23, 2023 04:46
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.46.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 17, 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.

3 participants