From 41cdbea7f760d5a94caa4d772eed2913dde59e5c Mon Sep 17 00:00:00 2001
From: alltheworld <gitdev13@gmail.com>
Date: Wed, 5 Mar 2014 17:42:38 +0200
Subject: [PATCH 1/3] report fixes

---
 public/js/script.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/script.js b/public/js/script.js
index e8058f9ebd2d..5569b2923c87 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -965,12 +965,12 @@ y2=GlobalY;
     doc.text(costX, tableTop, 'Unit Cost');
     doc.text(qtyX, tableTop, 'Quantity');
     doc.text(totalX, tableTop, 'Line Total');
-    doc.setFontType("normal");
+
     if (hasTaxes)
     {
         doc.text(taxX, tableTop, 'Tax');
     }
-
+    doc.setFontType("normal");
 
     doc.setFontSize(7);
 

From 03031710d75b0b1930c11cdf7cc24fa489de955b Mon Sep 17 00:00:00 2001
From: alltheworld <gitdev13@gmail.com>
Date: Wed, 5 Mar 2014 18:40:10 +0200
Subject: [PATCH 2/3] report fixes

---
 public/js/script.js | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/public/js/script.js b/public/js/script.js
index 5569b2923c87..53090ec2e170 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1215,11 +1215,8 @@ y2=GlobalY;
     Msg='Balance Due';
     var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize());
 
-
-
     doc.text(TmpMsgX, x, Msg);
 
-
     SetPdfColor('LightBlue',doc);
     AmountText = formatMoney(balance , currencyId);
     headerLeft=headerRight+400;
@@ -1227,7 +1224,38 @@ y2=GlobalY;
     doc.text(AmountX, x, AmountText);
 
 
+    GlobalY=GlobalY+100;
 
+    length=doc.splitTextToSize( terms, 200).length;
+    FontSize=10;
+    var h=length*FontSize;
+
+    //check do we need to go to next page
+    MinHeight=700;
+
+    if (GlobalY+h > MinHeight) {
+        GlobalY=Report1AddNewPage(invoice,account,doc);
+    }
+
+    SetPdfColor('Black',doc);
+    doc.text(40, GlobalY, terms);
+    GlobalY=GlobalY+h;
+
+
+    //GlobalY=GlobalY+100;
+    length=doc.splitTextToSize( public_notes, 200).length;
+    FontSize=10;
+    var h=length*FontSize;
+
+    //check do we need to go to next page
+    MinHeight=700;
+    if (GlobalY+h > MinHeight) {
+        GlobalY=Report1AddNewPage(invoice,account,doc);
+    }
+
+    SetPdfColor('Black',doc);
+    doc.text(40, GlobalY, public_notes);
+    GlobalY=GlobalY+h;
 
 
 

From 31452a37e867bbdb010dcf57044aa46e363d40b6 Mon Sep 17 00:00:00 2001
From: alltheworld <gitdev13@gmail.com>
Date: Wed, 5 Mar 2014 18:42:48 +0200
Subject: [PATCH 3/3] report fixes

---
 public/js/script.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/public/js/script.js b/public/js/script.js
index 53090ec2e170..708098d959c4 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1224,6 +1224,13 @@ y2=GlobalY;
     doc.text(AmountX, x, AmountText);
 
 
+
+
+
+
+    if (terms )
+    {
+
     GlobalY=GlobalY+100;
 
     length=doc.splitTextToSize( terms, 200).length;
@@ -1241,6 +1248,9 @@ y2=GlobalY;
     doc.text(40, GlobalY, terms);
     GlobalY=GlobalY+h;
 
+    }
+    if (public_notes )
+    {
 
     //GlobalY=GlobalY+100;
     length=doc.splitTextToSize( public_notes, 200).length;
@@ -1258,7 +1268,7 @@ y2=GlobalY;
     GlobalY=GlobalY+h;
 
 
-
+}
     return doc;
 }