Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on task invoices

Browse Source
This commit is contained in:
Hillel Coren 2017-06-20 12:53:27 +03:00
parent 2565188c24
commit 73dbf99482
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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

6
resources/assets/js/pdf.pdfmake.js
View File

@ -485,6 +485,7 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
} }
grid[0].push({text: invoiceLabels.line_total, style: ['tableHeader', 'lineTotalTableHeader']}); grid[0].push({text: invoiceLabels.line_total, style: ['tableHeader', 'lineTotalTableHeader']});
for (var i = 0; i < invoice.invoice_items.length; i++) { for (var i = 0; i < invoice.invoice_items.length; i++) {
var row = []; var row = [];
@ -498,7 +499,6 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
var custom_value1 = item.custom_value1; var custom_value1 = item.custom_value1;
var custom_value2 = item.custom_value2; var custom_value2 = item.custom_value2;
console.log('isTasks: %s', isTasks);
if (isTasks) { if (isTasks) {
if (item.invoice_item_type_id != 2) { if (item.invoice_item_type_id != 2) {
continue; continue;
@ -545,9 +545,9 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
} }
lineTotal += taxAmount1 + taxAmount2; lineTotal += taxAmount1 + taxAmount2;
} }
lineTotal = formatMoneyInvoice(lineTotal, invoice);
rowStyle = (i % 2 == 0) ? 'odd' : 'even'; lineTotal = formatMoneyInvoice(lineTotal, invoice);
rowStyle = (grid.length % 2 == 0) ? 'even' : 'odd';
if (invoice.has_product_key) { if (invoice.has_product_key) {
row.push({style:["productKey", rowStyle], text:productKey || ' '}); // product key can be blank when selecting from a datalist row.push({style:["productKey", rowStyle], text:productKey || ' '}); // product key can be blank when selecting from a datalist