Merge pull request #11 from alltheworld/report23

report 2 add
2014-02-25 15:59:53 +02:00 · 2014-02-25 15:59:53 +02:00 · c6584e0a6c
commit c6584e0a6c
parent a21aa75837 4006404f61
3 changed files with 758 additions and 107 deletions
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@ -567,7 +567,12 @@
    invoice.imageLogoWidth1 =120;
    invoice.imageLogoHeight1 = 40

-		return invoice;
+    invoice.imageLogo2 = "{{ HTML::image_data('images/report_logo2.jpg') }}";
+    invoice.imageLogoWidth2 =325/2;
+    invoice.imageLogoHeight2 = 81/2;
+
+
+    return invoice;
 	}

 	/*
--- a/public/images/report_logo2.jpg
+++ b/public/images/report_logo2.jpg
--- a/public/js/script.js
+++ b/public/js/script.js