mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-18 09:04:35 +01:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
b8a5b9b60c
@ -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;
|
||||||
|
@ -567,7 +567,12 @@
|
|||||||
invoice.imageLogoWidth1 =120;
|
invoice.imageLogoWidth1 =120;
|
||||||
invoice.imageLogoHeight1 = 40
|
invoice.imageLogoHeight1 = 40
|
||||||
|
|
||||||
return invoice;
|
invoice.imageLogo2 = "{{ HTML::image_data('images/report_logo2.jpg') }}";
|
||||||
|
invoice.imageLogoWidth2 =325/2;
|
||||||
|
invoice.imageLogoHeight2 = 81/2;
|
||||||
|
|
||||||
|
|
||||||
|
return invoice;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
BIN
public/images/report_logo2.jpg
Normal file
BIN
public/images/report_logo2.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 13 KiB |
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user