From e1b829c04b04caa3ab13f5744e7cc2369634c71d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 4 Apr 2016 20:10:00 +1000
Subject: [PATCH 1/2] Bug fixes on invoice transformer

---
 app/Ninja/Transformers/InvoiceTransformer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Ninja/Transformers/InvoiceTransformer.php b/app/Ninja/Transformers/InvoiceTransformer.php
index 81999a2a6481..413f43ce1a10 100644
--- a/app/Ninja/Transformers/InvoiceTransformer.php
+++ b/app/Ninja/Transformers/InvoiceTransformer.php
@@ -87,9 +87,9 @@ class InvoiceTransformer extends EntityTransformer
             'end_date' => $invoice->end_date,
             'last_sent_date' => $invoice->last_sent_date,
             'recurring_invoice_id' => (int) $invoice->recurring_invoice_id,
-            'tax_name1' => $invoice->tax_name1,
+            'tax_name1' => $invoice->tax_name1 ? $invoice->tax_name1 : '',
             'tax_rate1' => (float) $invoice->tax_rate1,
-            'tax_name2' => $invoice->tax_name2,
+            'tax_name2' => $invoice->tax_name2 ? $invoice->tax_name2 : '',
             'tax_rate2' => (float) $invoice->tax_rate2,
             'amount' => (float) $invoice->amount,
             'balance' => (float) $invoice->balance,

From 56657f8f152fe8dbe62b483cb6089d290b4eda25 Mon Sep 17 00:00:00 2001
From: Stefan Welsch <stefan.welsch@b-nova.com>
Date: Tue, 5 Apr 2016 11:43:07 +0200
Subject: [PATCH 2/2] Remove blank in email footer html tag

In the email footer is an presentation error after the account name because of the blank in the ending p-tag.
I have removed the blank.
---
 app/Models/Account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Account.php b/app/Models/Account.php
index 4f8b6834ba48..5fe2cccf7d7f 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -983,7 +983,7 @@ class Account extends Eloquent
             // Add line breaks if HTML isn't already being used
             return strip_tags($this->email_footer) == $this->email_footer ? nl2br($this->email_footer) : $this->email_footer;
         } else {
-            return "<p>" . trans('texts.email_signature') . "\n<br>\$account</ p>";
+            return "<p>" . trans('texts.email_signature') . "\n<br>\$account</p>";
         }
     }