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

Invoice surgage label as Discount #1765

Browse Source
This commit is contained in:
Hillel Coren 2017-12-14 23:07:17 +02:00
parent d11ddab462
commit e8d67b31ca
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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

@ -797,10 +797,10 @@ NINJA.subtotals = function(invoice, hideBalance)
} }
var customValue1 = NINJA.parseFloat(invoice.custom_value1); var customValue1 = NINJA.parseFloat(invoice.custom_value1);
var customValue1Label = customValue1 >= 0 ? (account.custom_invoice_label1 || invoiceLabels.surcharge) : invoiceLabels.discount; var customValue1Label = account.custom_invoice_label1 || invoiceLabels.surcharge;
var customValue2 = NINJA.parseFloat(invoice.custom_value2); var customValue2 = NINJA.parseFloat(invoice.custom_value2);
var customValue2Label = customValue2 >= 0 ? (account.custom_invoice_label2 || invoiceLabels.surcharge) : invoiceLabels.discount; var customValue2Label = account.custom_invoice_label2 || invoiceLabels.surcharge;
if (customValue1 && invoice.custom_taxes1 == '1') { if (customValue1 && invoice.custom_taxes1 == '1') {
data.push([{text: customValue1Label, style: ['subtotalsLabel', 'customTax1Label']}, {text: formatMoneyInvoice(invoice.custom_value1, invoice), style: ['subtotals', 'customTax1']}]); data.push([{text: customValue1Label, style: ['subtotalsLabel', 'customTax1Label']}, {text: formatMoneyInvoice(invoice.custom_value1, invoice), style: ['subtotals', 'customTax1']}]);