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: use Text Editor for rendering tax breakup table (backport #40563) #40570

Merged
merged 4 commits into from
Mar 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 20, 2024

Bug

Tax breakup table shows HTML code instead of rendering the content correctly after this fix.

Screenshot 2024-03-20 at 4 36 55 PM

Fix

Use the Text Editor field instead of the Long Text field type.

Screenshot 2024-03-20 at 5 37 10 PM

Closes frappe/frappe#25558


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

GursheenK and others added 2 commits March 20, 2024 13:06
(cherry picked from commit 1c63983)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
(cherry picked from commit 967540d)
Copy link
Contributor Author

mergify bot commented Mar 20, 2024

Cherry-pick of 1c63983 has failed:

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

You are currently cherry-picking commit 1c63983873.
  (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/pos_invoice/pos_invoice.json
	modified:   erpnext/accounts/doctype/pos_invoice/pos_invoice.py
	modified:   erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
	modified:   erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
	modified:   erpnext/accounts/doctype/sales_invoice/sales_invoice.json
	modified:   erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	modified:   erpnext/buying/doctype/purchase_order/purchase_order.py
	modified:   erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
	modified:   erpnext/selling/doctype/quotation/quotation.json
	modified:   erpnext/selling/doctype/quotation/quotation.py
	modified:   erpnext/selling/doctype/sales_order/sales_order.json
	modified:   erpnext/selling/doctype/sales_order/sales_order.py
	modified:   erpnext/stock/doctype/delivery_note/delivery_note.json
	modified:   erpnext/stock/doctype/delivery_note/delivery_note.py
	modified:   erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
	modified:   erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/buying/doctype/purchase_order/purchase_order.json
	both modified:   erpnext/buying/doctype/supplier_quotation/supplier_quotation.json

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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Mar 20, 2024
@GursheenK GursheenK merged commit 36c6820 into version-15-hotfix Mar 20, 2024
11 checks passed
@GursheenK GursheenK deleted the mergify/bp/version-15-hotfix/pr-40563 branch March 20, 2024 14:57
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.18.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 Apr 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants