From bbbcca27682fb4a26bafc0da12ff651677a6134a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 4 May 2014 20:11:27 +0300
Subject: [PATCH] Bug fixes

---
 app/controllers/InvoiceController.php | 2 +-
 app/models/Invoice.php                | 3 ++-
 public/built.js                       | 4 ++--
 public/js/script.js                   | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php
index 4570f52f4a9b..cc870094caeb 100755
--- a/app/controllers/InvoiceController.php
+++ b/app/controllers/InvoiceController.php
@@ -143,7 +143,7 @@ class InvoiceController extends \BaseController {
 		$invoice->invoice_date = Utils::fromSqlDate($invoice->invoice_date);
 		$invoice->due_date = Utils::fromSqlDate($invoice->due_date);
 		$invoice->is_pro = $client->account->isPro();
-
+		
 		$data = array(
 			'hideHeader' => true,
 			'showBreadcrumbs' => false,
diff --git a/app/models/Invoice.php b/app/models/Invoice.php
index 2e382b46b3f6..5b5eea24cae5 100755
--- a/app/models/Invoice.php
+++ b/app/models/Invoice.php
@@ -74,7 +74,8 @@ class Invoice extends EntityModel
 			'tax_name', 
 			'tax_rate', 
 			'account', 
-			'invoice_design_id']);
+			'invoice_design_id',
+			'is_pro']);
 		
 		$this->client->setVisible([
 			'name', 
diff --git a/public/built.js b/public/built.js
index 4e91914cb5f1..33a91ab71963 100644
--- a/public/built.js
+++ b/public/built.js
@@ -37107,9 +37107,9 @@ function displayInvoiceItems(doc, invoice, layout) {
     y += 4;
 
     if (invoice.invoice_design_id == 1) {
-      SetPdfColor('LightBlue', doc);
+      SetPdfColor('LightBlue', doc, 'primary');
     } else if (invoice.invoice_design_id == 2) {
-      SetPdfColor('SomeGreen', doc);
+      SetPdfColor('SomeGreen', doc, 'primary');
     } else if (invoice.invoice_design_id == 3) {
       doc.setFontType('bold');
     } else {
diff --git a/public/js/script.js b/public/js/script.js
index 03015294c8e7..0f2374e27ad1 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1640,9 +1640,9 @@ function displayInvoiceItems(doc, invoice, layout) {
     y += 4;
 
     if (invoice.invoice_design_id == 1) {
-      SetPdfColor('LightBlue', doc);
+      SetPdfColor('LightBlue', doc, 'primary');
     } else if (invoice.invoice_design_id == 2) {
-      SetPdfColor('SomeGreen', doc);
+      SetPdfColor('SomeGreen', doc, 'primary');
     } else if (invoice.invoice_design_id == 3) {
       doc.setFontType('bold');
     } else {