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

Enabled using date variables for non-recurring invoices

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

7
public/built.js
View File

@ -46756,7 +46756,6 @@ 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' && invoice.tax_rate) { } else if (key === 'tax' && invoice.tax_rate) {
console.log(invoice);
key = invoiceLabels[key] + ' ' + (invoice.tax_rate*1).toString() + '%'; key = invoiceLabels[key] + ' ' + (invoice.tax_rate*1).toString() + '%';
} else { } else {
key = invoiceLabels[key]; key = invoiceLabels[key];
@ -46952,10 +46951,8 @@ function displayInvoiceItems(doc, invoice, layout) {
shownItem = true; shownItem = true;
// process date variables // process date variables
if (invoice.is_recurring) { notes = processVariables(notes);
notes = processVariables(notes); productKey = processVariables(productKey);
productKey = processVariables(productKey);
}
var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty); var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty);
if (tax) { if (tax) {

6
public/js/script.js
View File

@ -1026,10 +1026,8 @@ function displayInvoiceItems(doc, invoice, layout) {
shownItem = true; shownItem = true;
// process date variables // process date variables
if (invoice.is_recurring) { notes = processVariables(notes);
notes = processVariables(notes); productKey = processVariables(productKey);
productKey = processVariables(productKey);
}
var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty); var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty);
if (tax) { if (tax) {