From da30d94bcee44838e5f323663d18a563dca42e6d Mon Sep 17 00:00:00 2001
From: alltheworld <gitdev13@gmail.com>
Date: Wed, 5 Mar 2014 15:31:46 +0200
Subject: [PATCH] report fixes discount field

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

diff --git a/public/js/script.js b/public/js/script.js
index 205fdbd5b6ce..010a255298e1 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1133,6 +1133,12 @@ y2=GlobalY;
 
     var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5;
     var h2 = doc.internal.getFontSize()*3+tablePadding*2;
+
+    if (invoice.discount)
+    {
+        var h2 =   doc.internal.getFontSize()*4+tablePadding*2;
+    }
+
     doc.rect(x1, y1, w2, h2, 'FD');
 
 
@@ -1151,11 +1157,32 @@ y2=GlobalY;
     var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize());
     doc.text(AmountX, x, AmountText);
 
-
-
-
     x += doc.internal.getFontSize()*2;
-    //doc.text(footerLeft, x, '');
+
+
+
+    if (invoice.discount)
+    {
+        Msg='Discount';
+        var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize());
+        doc.text(TmpMsgX, x, Msg);
+
+
+        discount=invoice.discount/100;
+        //alert (discount);
+        d=total*discount;
+
+
+        doc.setFontType("normal");
+        AmountText = formatMoney(d , currencyId);
+        headerLeft=headerRight+400;
+        var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize());
+        doc.text(AmountX, x, AmountText);
+        x += doc.internal.getFontSize()*2;
+    }
+
+
+
 
     Msg='Paid to Date';
     var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize());