From add9cb1569683cf6e161b6cf710d4a48f0d25b06 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 22 Apr 2014 00:25:40 +0300
Subject: [PATCH] Bug fixes

---
 app/views/invoices/edit.blade.php | 4 ++--
 app/views/invoices/view.blade.php | 4 ++--
 public/js/script.js               | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index 989ef25b96df..a4216006180b 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -680,7 +680,7 @@
 
 	function getPDFString() {		
 		var invoice = createInvoiceModel();
-		var doc = generatePDF(invoice, invoiceLabels);
+		var doc = generatePDF(invoice);
 		if (!doc) return;
 		return doc.output('datauristring');
 	}
@@ -724,7 +724,7 @@
 
 	function onDownloadClick() {
 		var invoice = createInvoiceModel();
-		var doc = generatePDF(invoice);
+		var doc = generatePDF(invoice, true);
 		doc.save('Invoice-' + $('#invoice_number').val() + '.pdf');
 	}
 
diff --git a/app/views/invoices/view.blade.php b/app/views/invoices/view.blade.php
index c3e07ba323db..969558993bba 100755
--- a/app/views/invoices/view.blade.php
+++ b/app/views/invoices/view.blade.php
@@ -48,7 +48,7 @@
 				invoice.imageWidth = {{ $invoice->client->account->getLogoWidth() }};
 				invoice.imageHeight = {{ $invoice->client->account->getLogoHeight() }};
 			@endif
-			var doc = generatePDF(invoice, true);
+			var doc = generatePDF(invoice);
 			if (!doc) return;
 			var string = doc.output('datauristring');
 						
@@ -77,7 +77,7 @@
 		var invoiceLabels = {{ json_encode($invoiceLabels) }};
 
 		function onDownloadClick() {
-			var doc = generatePDF(invoice);
+			var doc = generatePDF(invoice, true);
 			doc.save('Invoice-' + invoice.invoice_number + '.pdf');
 		}
 
diff --git a/public/js/script.js b/public/js/script.js
index 74aaa6c737b9..4315db2eed5d 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -103,16 +103,16 @@ function GetReportTemplate4(doc, invoice, layout, checkMath) {
 
 
 var invoiceOld;
-function generatePDF(invoice, checkMath) {
+function generatePDF(invoice, force) {
   invoice = calculateAmounts(invoice);  
   var a = copyInvoice(invoice);
   var b = copyInvoice(invoiceOld);
-  if (_.isEqual(a, b)) {
+  if (!force && _.isEqual(a, b)) {
     return;
   }
   invoiceOld = invoice;
   report_id = invoice.invoice_design_id;
-  doc = GetPdf(invoice, checkMath, report_id);
+  doc = GetPdf(invoice, false, report_id);
   return doc;
 }