schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #32024 from frappe/mergify/bp/version-13-hotfix/pr-31838

Browse Source 
fix(minor): don't print tax rate if its '0' (backport #31838)
This commit is contained in:
Deepesh Garg
2022-08-30 13:32:16 +05:30
committed by GitHub
parent 821c1cddfc a46dca57cb
commit 570729b73e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/selling/page/point_of_sale/pos_item_cart.js
View File

@@ -524,7 +524,8 @@ erpnext.PointOfSale.ItemCart = class {
const currency = this.events.get_frm().doc.currency;
const taxes_html = taxes.map(t => {
if (t.tax_amount_after_discount_amount == 0.0) return;
const description = /[0-9]+/.test(t.description) ? t.description : `${t.description} @ ${t.rate}%`;
// if tax rate is 0, don't print it.
const description = /[0-9]+/.test(t.description) ? t.description : ((t.rate != 0) ? `${t.description} @ ${t.rate}%`: t.description);
return `<div class="tax-row">
<div class="tax-label">${description}</div>
<div class="tax-value">${format_currency(t.tax_amount_after_discount_amount, currency)}</div>

3
erpnext/selling/page/point_of_sale/pos_past_order_summary.js
View File

@@ -130,7 +130,8 @@ erpnext.PointOfSale.PastOrderSummary = class {
if (!doc.taxes.length) return '';
let taxes_html = doc.taxes.map(t => {
const description = /[0-9]+/.test(t.description) ? t.description : `${t.description} @ ${t.rate}%`;
// if tax rate is 0, don't print it.
const description = /[0-9]+/.test(t.description) ? t.description : ((t.rate != 0) ? `${t.description} @ ${t.rate}%`: t.description);
return `
<div class="tax-row">
<div class="tax-label">${description}</div>