Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-18 09:04:35 +01:00
Code Issues Releases Activity

bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-02-25 13:52:40 +02:00
parent 056300c545
commit a21aa75837
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/routes.php
View File

@ -168,6 +168,7 @@ HTML::macro('breadcrumbs', function() {
unset($crumbs[$key]); unset($crumbs[$key]);
} }
} }
$crumbs = array_values($crumbs);
for ($i=0; $i<count($crumbs); $i++) { for ($i=0; $i<count($crumbs); $i++) {
$crumb = trim($crumbs[$i]); $crumb = trim($crumbs[$i]);
if (!$crumb) continue; if (!$crumb) continue;

3
public/js/script.js
View File

@ -13,7 +13,7 @@ var isIE = /*@cc_on!@*/false || !!document.documentMode; // At least IE6
function generatePDF(invoice, checkMath) { function generatePDF(invoice, checkMath) {
console.log ('DESIGN:'+invoice.invoice_design_id); //console.log ('DESIGN:'+invoice.invoice_design_id);
report_id=invoice.invoice_design_id; report_id=invoice.invoice_design_id;
@ -481,6 +481,7 @@ function populateInvoiceComboboxes(clientId, invoiceId) {
for (var i=0; i<list.length; i++) { for (var i=0; i<list.length; i++) {
var invoice = list[i]; var invoice = list[i];
var client = clientMap[invoice.client.public_id]; var client = clientMap[invoice.client.public_id];
if (!client) continue; // client is deleted/archived
$invoiceCombobox.append(new Option(invoice.invoice_number + ' - ' + invoice.invoice_status.name + ' - ' + $invoiceCombobox.append(new Option(invoice.invoice_number + ' - ' + invoice.invoice_status.name + ' - ' +
getClientDisplayName(client) + ' - ' + formatMoney(invoice.amount, invoice.currency_id) + ' | ' + getClientDisplayName(client) + ' - ' + formatMoney(invoice.amount, invoice.currency_id) + ' | ' +
formatMoney(invoice.balance, invoice.currency_id), invoice.public_id)); formatMoney(invoice.balance, invoice.currency_id), invoice.public_id));