Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don’t show 0.00 for line item discounts

Browse Source
This commit is contained in:
Hillel Coren 2018-03-27 11:55:07 +03:00
parent 83ee802fa4
commit 396995ab3c
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
public/built.js
View File

File diff suppressed because one or more lines are too long

2
public/built.js.map
View File

File diff suppressed because one or more lines are too long

4
resources/assets/js/pdf.pdfmake.js
View File

@ -826,6 +826,7 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
} else if (field == 'custom_value2') { } else if (field == 'custom_value2') {
value = customValue2; value = customValue2;
} else if (field == 'discount') { } else if (field == 'discount') {
if (NINJA.parseFloat(discount)) {
if (parseInt(invoice.is_amount_discount)) { if (parseInt(invoice.is_amount_discount)) {
value = formatMoneyInvoice(discount, invoice); value = formatMoneyInvoice(discount, invoice);
} else { } else {
@ -833,6 +834,9 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
value = discount + '%'; value = discount + '%';
} }
} }
} else {
value = '';
}
} else if (field == 'tax') { } else if (field == 'tax') {
value = ' '; value = ' ';
if (item.tax_name1) { if (item.tax_name1) {