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: Show order tax amount in customer currency on the portal (backport #44915) #44922

Merged
merged 2 commits into from
Dec 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 26, 2024

Previously, the system was showing the tax amount on the customer portal in the company's base currency instead of customer currency. Now it shows in the customer currency.


This is an automatic backport of pull request #44915 done by Mergify.

(cherry picked from commit b998933)

# Conflicts:
#	erpnext/templates/includes/order/order_taxes.html
Copy link
Contributor Author

mergify bot commented Dec 26, 2024

Cherry-pick of b998933 has failed:

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

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

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@nabinhait nabinhait merged commit 78e0799 into version-14-hotfix Dec 27, 2024
3 of 5 checks passed
@nabinhait nabinhait deleted the mergify/bp/version-14-hotfix/pr-44915 branch December 27, 2024 05:56
frappe-pr-bot pushed a commit that referenced this pull request Jan 1, 2025
## [14.78.6](v14.78.5...v14.78.6) (2025-01-01)

### Bug Fixes

* apply apply_pricing_rule date change ([cca507f](cca507f))
* clear payment schedule in purchase invoice for is_paid ([cdd3763](cdd3763))
* duplicate validate for closing stock balance (backport [#45015](#45015)) ([#45021](#45021)) ([e2b6615](e2b6615))
* failing tests fixed ([498abf7](498abf7))
* get item tax template based on posting date ([56d0686](56d0686))
* load customer default price list in pos during item selection (backport [#44991](#44991)) ([#44992](#44992)) ([0f687f1](0f687f1))
* pos payment using non-default mode of payment (backport [#44920](#44920)) ([#44970](#44970)) ([a0063b3](a0063b3)), closes [#41108](#41108)
* refactor query in get_total_allocated_amount in bank_transaction ([cc0a478](cc0a478))
* resolve conflicts ([443a0b8](443a0b8))
* set paid amount in party currency in bank reco payment entry ([43a40b1](43a40b1))
* Show order tax amount in customer currency on the portal (backport [#44915](#44915)) ([#44922](#44922)) ([78e0799](78e0799))
* update item_tax_rate in backend ([cf980a1](cf980a1))
* update payment amount for partial pos return (backport [#44065](#44065)) ([#44961](#44961)) ([1da4712](1da4712))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.78.6 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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.

2 participants