From 9281cd5ba21b5e33a83d1aa551dd9d2920e49a50 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 20 Apr 2016 11:04:54 +0300
Subject: [PATCH] Fix for default quote terms

---
 app/Ninja/Repositories/InvoiceRepository.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 845bb0082d79..6b41db461a31 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -284,7 +284,14 @@ class InvoiceRepository extends BaseRepository
             $invoice->end_date = null;
         }
 
-        $invoice->terms = (isset($data['terms']) && trim($data['terms'])) ? trim($data['terms']) : (!$publicId && $account->invoice_terms ? $account->invoice_terms : '');
+        if (isset($data['terms']) && trim($data['terms'])) {
+            $invoice->terms = trim($data['terms']);
+        } elseif ($isNew && $account->{"{$entityType}_terms"}) {
+            $invoice->terms = $account->{"{$entityType}_terms"};
+        } else {
+            $invoice->terms = '';
+        }
+        
         $invoice->invoice_footer = (isset($data['invoice_footer']) && trim($data['invoice_footer'])) ? trim($data['invoice_footer']) : (!$publicId && $account->invoice_footer ? $account->invoice_footer : '');
         $invoice->public_notes = isset($data['public_notes']) ? trim($data['public_notes']) : null;