Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Ensure 0% taxes are shown

Browse Source
This commit is contained in:
Hillel Coren 2016-07-20 20:48:56 +03:00
parent f4f13d3119
commit 8bc3d6c937
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/js/pdfmake-ninja.js
View File

@ -502,11 +502,11 @@ NINJA.subtotals = function(invoice, hideBalance)
} }
} }
if (invoice.tax_amount1) { if (invoice.tax_name1) {
var taxStr = invoice.tax_name1 + ' ' + (invoice.tax_rate1*1).toString() + '%'; var taxStr = invoice.tax_name1 + ' ' + (invoice.tax_rate1*1).toString() + '%';
data.push([{text: taxStr, style: ['subtotalsLabel', 'tax1Label']}, {text: formatMoneyInvoice(invoice.tax_amount1, invoice), style: ['subtotals', 'tax1']}]); data.push([{text: taxStr, style: ['subtotalsLabel', 'tax1Label']}, {text: formatMoneyInvoice(invoice.tax_amount1, invoice), style: ['subtotals', 'tax1']}]);
} }
if (invoice.tax_amount2) { if (invoice.tax_name2) {
var taxStr = invoice.tax_name2 + ' ' + (invoice.tax_rate2*1).toString() + '%'; var taxStr = invoice.tax_name2 + ' ' + (invoice.tax_rate2*1).toString() + '%';
data.push([{text: taxStr, style: ['subtotalsLabel', 'tax2Label']}, {text: formatMoneyInvoice(invoice.tax_amount2, invoice), style: ['subtotals', 'tax2']}]); data.push([{text: taxStr, style: ['subtotalsLabel', 'tax2Label']}, {text: formatMoneyInvoice(invoice.tax_amount2, invoice), style: ['subtotals', 'tax2']}]);
} }

8
resources/assets/js/script.js
View File

@ -651,12 +651,12 @@ function calculateAmounts(invoice) {
invoice.has_product_key = true; invoice.has_product_key = true;
} }
if (item.tax_rate1 && parseFloat(item.tax_rate1)) { if (item.tax_name1) {
taxRate1 = parseFloat(item.tax_rate1); taxRate1 = parseFloat(item.tax_rate1);
taxName1 = item.tax_name1; taxName1 = item.tax_name1;
} }
if (item.tax_rate2 && parseFloat(item.tax_rate2)) { if (item.tax_name2) {
taxRate2 = parseFloat(item.tax_rate2); taxRate2 = parseFloat(item.tax_rate2);
taxName2 = item.tax_name2; taxName2 = item.tax_name2;
} }
@ -672,7 +672,7 @@ function calculateAmounts(invoice) {
} }
var taxAmount1 = roundToTwo(lineTotal * taxRate1 / 100); var taxAmount1 = roundToTwo(lineTotal * taxRate1 / 100);
if (taxAmount1) { if (taxName1) {
var key = taxName1 + taxRate1; var key = taxName1 + taxRate1;
if (taxes.hasOwnProperty(key)) { if (taxes.hasOwnProperty(key)) {
taxes[key].amount += taxAmount1; taxes[key].amount += taxAmount1;
@ -682,7 +682,7 @@ function calculateAmounts(invoice) {
} }
var taxAmount2 = roundToTwo(lineTotal * taxRate2 / 100); var taxAmount2 = roundToTwo(lineTotal * taxRate2 / 100);
if (taxAmount2) { if (taxName2) {
var key = taxName2 + taxRate2; var key = taxName2 + taxRate2;
if (taxes.hasOwnProperty(key)) { if (taxes.hasOwnProperty(key)) {
taxes[key].amount += taxAmount2; taxes[key].amount += taxAmount2;