From ca8db0ffbc7e11db6a22c483c87874c70ef4f556 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 19 Oct 2014 23:15:37 +0300 Subject: [PATCH] Enabled using date variables for non-recurring invoices --- public/built.js | 7 ++----- public/js/script.js | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/public/built.js b/public/built.js index 0fc4aa3b17f9..a7990a5aaa84 100644 --- a/public/built.js +++ b/public/built.js @@ -46756,7 +46756,6 @@ function displayGrid(doc, invoice, data, x, y, layout, options) { if (key.substring(0, 6) === 'custom') { key = invoice.account[key]; } else if (key === 'tax' && invoice.tax_rate) { - console.log(invoice); key = invoiceLabels[key] + ' ' + (invoice.tax_rate*1).toString() + '%'; } else { key = invoiceLabels[key]; @@ -46952,10 +46951,8 @@ function displayInvoiceItems(doc, invoice, layout) { shownItem = true; // process date variables - if (invoice.is_recurring) { - notes = processVariables(notes); - productKey = processVariables(productKey); - } + notes = processVariables(notes); + productKey = processVariables(productKey); var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty); if (tax) { diff --git a/public/js/script.js b/public/js/script.js index ce82108a6741..4a9c8d80dba0 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1026,10 +1026,8 @@ function displayInvoiceItems(doc, invoice, layout) { shownItem = true; // process date variables - if (invoice.is_recurring) { - notes = processVariables(notes); - productKey = processVariables(productKey); - } + notes = processVariables(notes); + productKey = processVariables(productKey); var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty); if (tax) {