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

fix #174 - Tax rate error in live PDF

Browse Source
This commit is contained in:
Hillel Coren 2014-10-19 23:10:16 +03:00
parent 76e9f107e7
commit 001208e345
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/built.js
View File

@ -46755,8 +46755,9 @@ function displayGrid(doc, invoice, data, x, y, layout, options) {
if (key.substring(0, 6) === 'custom') { if (key.substring(0, 6) === 'custom') {
key = invoice.account[key]; key = invoice.account[key];
} else if (key === 'tax') { } else if (key === 'tax' && invoice.tax_rate) {
key = invoiceLabels[key] + ' ' + invoice.tax_amount + '%'; console.log(invoice);
key = invoiceLabels[key] + ' ' + (invoice.tax_rate*1).toString() + '%';
} else { } else {
key = invoiceLabels[key]; key = invoiceLabels[key];
} }

4
public/js/script.js
View File

@ -830,8 +830,8 @@ function displayGrid(doc, invoice, data, x, y, layout, options) {
if (key.substring(0, 6) === 'custom') { if (key.substring(0, 6) === 'custom') {
key = invoice.account[key]; key = invoice.account[key];
} else if (key === 'tax') { } else if (key === 'tax' && invoice.tax_rate) {
key = invoiceLabels[key] + ' ' + invoice.tax_amount + '%'; key = invoiceLabels[key] + ' ' + (invoice.tax_rate*1).toString() + '%';
} else { } else {
key = invoiceLabels[key]; key = invoiceLabels[key];
} }