From 4006404f615f3c9e6a446f78d775f7ee4f93a959 Mon Sep 17 00:00:00 2001
From: alltheworld <gitdev13@gmail.com>
Date: Tue, 25 Feb 2014 14:54:50 +0200
Subject: [PATCH] report 2 add

---
 app/views/invoices/edit.blade.php |   7 +-
 public/images/report_logo2.jpg    | Bin 0 -> 13504 bytes
 public/js/script.js               | 858 ++++++++++++++++++++++++++----
 3 files changed, 758 insertions(+), 107 deletions(-)
 create mode 100644 public/images/report_logo2.jpg

diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index d0e294a17c2f..b28396570d5c 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -567,7 +567,12 @@
     invoice.imageLogoWidth1 =120;
     invoice.imageLogoHeight1 = 40
 
-		return invoice;
+    invoice.imageLogo2 = "{{ HTML::image_data('images/report_logo2.jpg') }}";
+    invoice.imageLogoWidth2 =325/2;
+    invoice.imageLogoHeight2 = 81/2;
+
+
+    return invoice;
 	}
 
 	/*
diff --git a/public/images/report_logo2.jpg b/public/images/report_logo2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e4b5ba66ddd7c80b63044bcf7c33d466402b083f
GIT binary patch
literal 13504
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
VN|Iy7?FR%=cD6v#2UmCLzW{#JF#rGn

literal 0
HcmV?d00001

diff --git a/public/js/script.js b/public/js/script.js
index f93c9fc45f9c..e7bd0a6be234 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -12,16 +12,12 @@ var isIE = /*@cc_on!@*/false || !!document.documentMode; // At least IE6
 
 function generatePDF(invoice, checkMath) {
 
-
-    //console.log ('DESIGN:'+invoice.invoice_design_id);
-
     report_id=invoice.invoice_design_id;
-
     doc= GetPdf(invoice,checkMath,report_id);
-
     return doc;
 }
 
+
 /* Handle converting variables in the invoices (ie, MONTH+1) */
 function processVariables(str) {
 	if (!str) return '';
@@ -533,13 +529,14 @@ $.fn.datepicker.defaults.autoclose = true;
 $.fn.datepicker.defaults.todayHighlight = true;
 
 
+
 //====================================================================================================================
 
 function GetPdf(invoice,checkMath,report_id){
 
 
     if (report_id==1) return GetReportTemplate1(invoice,checkMath);
-    //if (report_id==2) return GetReportTemplate1(invoice,checkMath);
+    if (report_id==2) return GetReportTemplate2(invoice,checkMath);
     //if (report_id==3) return GetReportTemplate1(invoice,checkMath);
 
 
@@ -551,13 +548,13 @@ function GetPdf(invoice,checkMath,report_id){
 
 
 
-function GetReportTemplate1 (invoice,checkMath)
+function GetReportTemplate2 (invoice,checkMath)
 {
     var doc=false;
 
-//    var MaxWidth=550;
-//    var MaxHeight=800;
-//    return generatePdf2(invoice,checkMath);
+// var MaxWidth=550;
+// var MaxHeight=800;
+// return generatePdf2(invoice,checkMath);
 
     var GlobalY=0;//Y position of line at current page
 
@@ -644,14 +641,34 @@ function GetReportTemplate1 (invoice,checkMath)
 
 
 
+    /*
+     @param orientation One of "portrait" or "landscape" (or shortcuts "p" (Default), "l")
+     @param unit Measurement unit to be used when coordinates are specified. One of "pt" (points), "mm" (Default), "cm", "in"
+     @param format One of 'a3', 'a4' (Default),'a5' ,'letter' ,'legal'
+     @returns {jsPDF}
+     */
+    var doc = new jsPDF('portrait', 'pt','a4');
 
 
-    var doc = new jsPDF('p', 'pt');
 
-  //set default style for report
+    //Set PDF properities
+    doc.setProperties({
+        title: '',
+        subject: 'Report',
+        author: 'Ninja',
+        keywords: 'pdf, javascript,geenerated',
+        creator: 'Ninja'
+    });
+
+
+
+
+
+    //set default style for report
     doc.setFont('Helvetica','');
     doc.setFontSize(7);
 
+
 //----------------------------------------------------------------------------------------------------
     //Print header on document
     //for now we will put static header
@@ -684,7 +701,7 @@ function GetReportTemplate1 (invoice,checkMath)
     var dueDateX = headerRight - (doc.getStringUnitWidth(dueDate) * doc.internal.getFontSize());
     var poNumberX = headerRight - (doc.getStringUnitWidth(invoice.po_number) * doc.internal.getFontSize());
 
- //   doc.setFontType("normal");
+
 
     var y = accountTop;
     var left = marginLeft;
@@ -699,9 +716,9 @@ function GetReportTemplate1 (invoice,checkMath)
     }
 
     SetPdfColor('GrayText',doc);
-    doc.setFontSize(6);
+    doc.setFontSize(7);
 
-//TODO:NOT AVAILEABLE FROM DATAMOEL
+//TODO:NOT AVAILEABLE FROM DATAMODEL
     //account.email='email N/A';
     if (account.email) {
         y += rowHeight;
@@ -712,7 +729,7 @@ function GetReportTemplate1 (invoice,checkMath)
         //console.log('account.email NOT DEFINED !');
     }
 
-//TODO:NOT AVAILEABLE FROM DATAMOEL
+//TODO:NOT AVAILEABLE FROM DATAMODEL
     //account.phone='phone N/A';
     if (account.phone) {
         y += rowHeight;
@@ -743,37 +760,22 @@ function GetReportTemplate1 (invoice,checkMath)
         y += rowHeight;
         doc.text(left, y, account.city + ', ' + account.state + ' ' + account.postal_code);
     }
-        if (account.country) {
-     y += rowHeight;
-     doc.text(left, y, account.country.name);
-     }
-
-
-
-
+    if (account.country) {
+        y += rowHeight;
+        doc.text(left, y, account.country.name);
+    }
 
 //-----------------------------Publish Client Details block--------------------------------------------
 
-
     var y = accountTop;
     var left = marginLeft;
 
     var headerY = headerTop;
 
-
-
-
     SetPdfColor('LightBlue',doc);
-    doc.setFontSize(8);
-
-    //doc.setFontType("bold");
-
+    doc.setFontSize('11');
     doc.text(50, headerTop, 'Invoice');
 
-
-
-
-
     SetPdfColor('GrayLogo',doc); //set black color
     y=130;
     doc.line(30, y, 560, y); // horizontal line
@@ -794,19 +796,12 @@ function GetReportTemplate1 (invoice,checkMath)
 
     SetPdfColor('Black',doc); //set black color
 
-    doc.setFontSize(6);
+    doc.setFontSize(7);
     doc.text(marginLeft1, line1, 'Invoice Number');
     doc.text(marginLeft1, line2, 'Invoice date');
     doc.text(marginLeft1, line3, 'Amount Due');
 
 
-
-
-
-    //  invoiceNumber='12345'
-    //   invoiceDate='12345'
-    //invoiceAmount='12345'
-
     doc.setFontType("bold");
     doc.text(marginLeft2, line1, invoiceNumber);
     doc.setFontType("normal");
@@ -821,7 +816,7 @@ function GetReportTemplate1 (invoice,checkMath)
     ClientCompanyPhone=client.work_phone;
 
     ClientCompanyAddress1=client.address1;
-    ClientCompanyAddress2=client.address2+'  '+client.postal_code;
+    ClientCompanyAddress2=client.address2+' '+client.postal_code;
 
 
     SetPdfColor('Black',doc); //set black color
@@ -845,7 +840,6 @@ function GetReportTemplate1 (invoice,checkMath)
     doc.text(marginLeft3, line21, ClientCompanyAddress1);
     doc.text(marginLeft3, line22, ClientCompanyAddress2);
 
-
     doc.text(marginLeft3, line3, ClientCompanyEmail);
     doc.text(marginLeft3, line31, ClientCompanyPhone);
 
@@ -854,7 +848,6 @@ function GetReportTemplate1 (invoice,checkMath)
     y=195;
     doc.line(30, y, 560, y); // horizontal line
 
-
 //--------------------------------Publishing Table--------------------------------------------------
     GlobalY=y+30;
 
@@ -878,18 +871,14 @@ function GetReportTemplate1 (invoice,checkMath)
         qtyRight -= 40;
     }
 
-
-
     var costX = unitCostRight - (doc.getStringUnitWidth('Unit Cost') * doc.internal.getFontSize());
     var qtyX = qtyRight - (doc.getStringUnitWidth('Quantity') * doc.internal.getFontSize());
     var taxX = taxRight - (doc.getStringUnitWidth('Tax') * doc.internal.getFontSize());
     var totalX = lineTotalRight - (doc.getStringUnitWidth('Line Total') * doc.internal.getFontSize());
 
-
-
     tableTop=GlobalY;//redefine this to dynamic value
 
-    doc.setFontSize(9);
+    doc.setFontSize(10);
 
     doc.text(tableLeft, tableTop, 'Item');
     doc.text(descriptionLeft, tableTop, 'Description');
@@ -906,15 +895,13 @@ function GetReportTemplate1 (invoice,checkMath)
     doc.setFontSize(7);
 
     /* line items */
-    //doc.setFontType("normal");
+
     var line = 1;
     var total = 0;
     var shownItem = false;
 
 
-
-
-GlobalY=GlobalY+14; //padding from top
+    GlobalY=GlobalY+14; //padding from top
 
     var FontSize=7;
     doc.setFontSize(FontSize);
@@ -965,13 +952,6 @@ GlobalY=GlobalY+14; //padding from top
         var totalX = lineTotalRight - (doc.getStringUnitWidth(lineTotal) * doc.internal.getFontSize());
 
 
-
-
-
-
-
-
-
         length=doc.splitTextToSize(item.notes, 200).length;
         var h=length*FontSize;
 
@@ -1005,7 +985,7 @@ GlobalY=GlobalY+14; //padding from top
 
         }
 
-            if ((i%2)===0){
+        if ((i%2)===0){
             doc.setLineWidth(0.5);
             doc.setDrawColor(200,200,200);
             doc.setFillColor(230,230,230);
@@ -1014,8 +994,8 @@ GlobalY=GlobalY+14; //padding from top
 
             var y1 = GlobalY-FontSize;
 
-            var w2 =  510+tablePadding*2;//lineTotalRight-tablePadding*5;
-            var h2 =  doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding;
+            var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5;
+            var h2 = doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding;
 
 
 
@@ -1049,40 +1029,6 @@ GlobalY=GlobalY+14; //padding from top
 
 
 
-
-
-
-
-/*
-
-        if (line > MaxLinesPerPage) {
-            line = 0;
-
-            tableTop = 40;
-            GlobalY=tableTop;
-
-
-
-
-            var MaxLinesPerPage=70;
-
-            doc.addPage();
-            if (invoice.imageLogo1)
-            {
-                pageHeight=820;
-                var left = headerRight ;
-                y=pageHeight-invoice.imageLogoHeight1;
-
-
-                var left = headerRight - invoice.imageLogoWidth1;
-                doc.addImage(invoice.imageLogo1, 'JPEG', left, y, invoice.imageLogoWidth1, invoice.imageLogoHeight1);
-
-
-            }
-        }
-        */
-
-
     }
 
 
@@ -1100,8 +1046,25 @@ GlobalY=GlobalY+14; //padding from top
     doc.setFontType("bold");
     MsgRightAlign=400;
 
+
+
+    GlobalY=x;
+
+    doc.setLineWidth(0.3);
+    doc.setDrawColor(200,200,200);
+    doc.setFillColor(251,251,251);
+    var x1 = tableLeft-tablePadding*2 ;
+    var y1 = GlobalY-FontSize-tablePadding;
+    var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5;
+    var h2 = doc.internal.getFontSize()*3+tablePadding*2;
+    doc.rect(x1, y1, w2, h2, 'FD');
+
+
+
+
+
     Msg='Total';
-    var TmpMsgX =  MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize());
+    var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize());
     doc.text(TmpMsgX, x, Msg);
 
 
@@ -1119,7 +1082,7 @@ GlobalY=GlobalY+14; //padding from top
     //doc.text(footerLeft, x, '');
 
     Msg='Amount Payed';
-    var TmpMsgX =  MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize());
+    var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize());
     doc.text(TmpMsgX, x, Msg);
 
 
@@ -1138,7 +1101,7 @@ GlobalY=GlobalY+14; //padding from top
     x += doc.internal.getFontSize()*4;
     //doc.text(footerLeft, x, '');
     Msg='Amount Due';
-    var TmpMsgX =  MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize());
+    var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize());
 
 
 
@@ -1160,24 +1123,668 @@ GlobalY=GlobalY+14; //padding from top
 }
 
 
+function GetReportTemplate1 (invoice,checkMath)
+{
+    var doc=false;
+
+    var GlobalY=0;//Y position of line at current page
+
+
+
+    var client = invoice.client;
+    var account = invoice.account;
+
+
+    var currencyId = client.currency_id;
+    var invoiceNumber = invoice.invoice_number;
+    var invoiceDate = invoice.invoice_date ? invoice.invoice_date : '';
+    var dueDate = invoice.due_date ? invoice.due_date : '';
+
+    var paid_to_date=client.paid_to_date;
+
+    var headerRight = 150;
+    var accountTop = 30;
+    var marginLeft = 180;
+    var rowHeight = 10;
+    var headerTop = 125; //height of HEADER //should be dynamic !
+
+
+    var descriptionLeft = 162;
+    var unitCostRight = 410;
+    var qtyRight = 480;
+    var taxRight = 480;
+    var lineTotalRight = 550;
+    var tableLeft = 50;
+
+
+    //var tableTop = 240+100;
+
+    //var tableRowHeight = 18;
+    var tablePadding = 6;
+
+
+
+//------------------------------ move to functions !
+    var total = 0;
+    for (var i=0; i<invoice.invoice_items.length; i++) {
+        var item = invoice.invoice_items[i];
+        var tax = 0;
+        if (item.tax && parseFloat(item.tax.rate)) {
+            tax = parseFloat(item.tax.rate);
+        } else if (item.tax_rate && parseFloat(item.tax_rate)) {
+            tax = parseFloat(item.tax_rate);
+        }
+
+        var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty);
+        if (tax) {
+            lineTotal += lineTotal * tax / 100;
+        }
+        if (lineTotal) {
+            total += lineTotal;
+        }
+    }
+
+    if (invoice.discount > 0) {
+
+        var discount = total * (invoice.discount/100);
+        total -= discount;
+    }
+
+    var tax = 0;
+    if (invoice.tax && parseFloat(invoice.tax.rate)) {
+        tax = parseFloat(invoice.tax.rate);
+    } else if (invoice.tax_rate && parseFloat(invoice.tax_rate)) {
+        tax = parseFloat(invoice.tax_rate);
+    }
+
+    if (tax) {
+        var tax = total * (tax/100);
+        total = parseFloat(total) + parseFloat(tax);
+    }
+
+    total = formatMoney(total - (invoice.amount - invoice.balance), currencyId);
+
+    var balance = formatMoney(total, currencyId);
+
+    /*
+     @param orientation One of "portrait" or "landscape" (or shortcuts "p" (Default), "l")
+     @param unit Measurement unit to be used when coordinates are specified. One of "pt" (points), "mm" (Default), "cm", "in"
+     @param format One of 'a3', 'a4' (Default),'a5' ,'letter' ,'legal'
+     @returns {jsPDF}
+     */
+    var doc = new jsPDF('portrait', 'pt','a4');
+
+
+
+    //Set PDF properities
+    doc.setProperties({
+        title: '',
+        subject: 'Report',
+        author: 'Ninja',
+        keywords: 'pdf, javascript,geenerated',
+        creator: 'Ninja'
+    });
+
+
+    //set default style for report
+    doc.setFont('Helvetica','');
+    doc.setFontSize(7);
+
+    doc.setLineWidth(0.5);
+
+    doc.setFillColor( 46,43,43);
+    doc.setFillColor( 46,43,43);
+
+    var x1 =0;
+
+    var y1 = 0;
+
+    var w2 = 595;
+    var h2 = 100;// doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding;
+    doc.rect(x1, y1, w2, h2, 'FD');
+
+
+
+
+
+
+//----------------------------------------------------------------------------------------------------
+    if (invoice.image)
+    {
+        var left = headerRight - invoice.imageWidth;
+        doc.addImage(invoice.image, 'JPEG', left, 30, invoice.imageWidth, invoice.imageHeight);
+    }
+
+    Report2AddFooter (invoice,doc);
+
+    var invoiceNumberX = headerRight - (doc.getStringUnitWidth(invoiceNumber, false) * doc.internal.getFontSize());
+    var invoiceDateX = headerRight - (doc.getStringUnitWidth(invoiceDate) * doc.internal.getFontSize());
+    var dueDateX = headerRight - (doc.getStringUnitWidth(dueDate) * doc.internal.getFontSize());
+    var poNumberX = headerRight - (doc.getStringUnitWidth(invoice.po_number) * doc.internal.getFontSize());
+
+
+
+    var y = accountTop;
+    var left = marginLeft;
+
+
+    doc.setFontSize(7);
+    SetPdfColor('White',doc);
+
+
+
+//TODO:NOT AVAILEABLE FROM DATAMODEL
+    //account.email='email N/A';
+    if (account.email) {
+        y += rowHeight;
+        doc.text(left, y, account.email);
+    }
+    else
+    {
+        //console.log('account.email NOT DEFINED !');
+    }
+
+//TODO:NOT AVAILEABLE FROM DATAMODEL
+    if (account.phone) {
+        y += rowHeight;
+        doc.text(left, y, account.phone);
+    }
+    else
+    {
+        //console.log('account.phone NOT DEFINED !');
+    }
+
+
+    var HeaderMarginThirdColumn=70;
+
+    //second column
+    doc.setFontType("bold");
+    var MaxWidth=594;
+
+    var LineOne= account.name;
+
+    var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineOne) * doc.internal.getFontSize());
+
+    if (account.name) {
+
+        y += rowHeight;
+        doc.text(AlignLine, y, LineOne);
+    }
+
+    y += rowHeight;
+
+    doc.setFontType("normal");
+
+
+    var LineTwo= account.address1+' '+account.address2+account.city+' '+account.country.name;
+
+    var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineTwo) * doc.internal.getFontSize());
+    y += rowHeight;
+    doc.text(AlignLine, y, LineTwo);
+
+
+//-----------------------------Publish Client Details block--------------------------------------------
+
+    var y = accountTop;
+    var left = marginLeft;
+
+    var headerY = headerTop;
+
+
+
+    SetPdfColor('GrayLogo',doc); //set black color
+
+
+    var line1=headerTop+16;
+    var line2=headerTop+16*2;
+    var line21=headerTop+16*1.6;
+    var line22=headerTop+16*2.2;
+
+    var line3=headerTop+16*3;
+    var line31=headerTop+16*3.6;
+
+    var marginLeft1=50;
+
+
+    SetPdfColor('Black',doc); //set black color
+
+    doc.setFontSize(7);
+
+
+    ClientCompanyName=client.name;
+    ClientCompanyEmail='';//client.email;//'22222222';
+    ClientCompanyPhone=client.work_phone;
+
+    ClientCompanyAddress1=client.address1;
+    ClientCompanyAddress2=client.address2+' '+client.postal_code;
+
+    if(client)
+    {
+        ClientCompanyName=getClientDisplayName(client);
+        ClientCompanyPhone=client.work_phone;
+        ClientCompanyEmail=client.contacts[0].email;
+
+    }
+
+    //show left column
+    SetPdfColor('Black',doc); //set black color
+    doc.setFontType("normal");
+
+
+//publish filled box
+    doc.setDrawColor(200,200,200);
+    doc.setFillColor(54,164,152);
+
+    GlobalY=190;
+    doc.setLineWidth(0.5);
+
+    var BlockLenght=220;
+    var x1 =595-BlockLenght;
+    var y1 = GlobalY-12;
+    var w2 = BlockLenght;
+    var h2 = 90;
+    doc.rect(x1, y1, w2, h2, 'FD');
+
+
+
+    SetPdfColor('SomeGreen',doc);
+    doc.setFontSize('14');
+    doc.setFontType("bold");
+    doc.text(50, GlobalY, 'YOUR INVOICE');
+
+
+    var z=GlobalY;
+    z=z+30;
+
+
+    SetPdfColor('Black',doc);
+
+    if (ClientCompanyName)
+    {
+        doc.setFontSize('8');
+        doc.setFontType("bold");
+        doc.text(marginLeft1, z, ClientCompanyName);
+        z=z+15;//doc.internal.getFontSize();
+    }
+
+    if (ClientCompanyAddress1)
+    {
+
+        doc.setFontSize('8');
+        doc.setFontType("normal");
+        doc.text(marginLeft1, z, ClientCompanyAddress1);
+        z=z+15;////z=z+doc.internal.getFontSize();
+    }
+    if (ClientCompanyAddress2)
+    {
+
+        doc.setFontSize('8');
+        doc.setFontType("normal");
+        doc.text(marginLeft1, z, ClientCompanyAddress2);
+        z=z+15;////z=z+doc.internal.getFontSize();
+    }
+
+    if (ClientCompanyEmail)
+    {
+        doc.setFontSize('8');
+        doc.setFontType("normal");
+        doc.text(marginLeft1, z, ClientCompanyEmail);
+        z=z+15;///z=z+doc.internal.getFontSize();
+    }
+    if (ClientCompanyPhone)
+    {
+
+        doc.setFontSize('8');
+        doc.setFontType("normal");
+        doc.text(marginLeft1, z, ClientCompanyPhone);
+        z=z+15;////z=z+doc.internal.getFontSize();
+    }
+
+
+    marginLeft2=395;
+
+    //publish left side information
+
+    SetPdfColor('White',doc);
+    z=GlobalY+15;
+
+    doc.setFontSize('8');
+    doc.setFontType("normal");
+    doc.text(marginLeft2, z,'Invoice Number');
+    z=z+15;//doc.internal.getFontSize();
+
+
+    doc.setFontSize('8');
+    doc.setFontType("normal");
+    doc.text(marginLeft2, z,'Invoice date');
+    z=z+15;//doc.internal.getFontSize();
+
+    doc.setFontSize('8');
+    doc.setFontType("normal");
+    doc.text(marginLeft2, z,'Due Date');
+    z=z+15;//doc.internal.getFontSize();
+
+
+    marginLeft3=marginLeft2+65;
+
+    z=GlobalY+15;
+
+
+    var invoiceNumber = invoice.invoice_number;
+    var invoiceDate = invoice.invoice_date ? invoice.invoice_date : '';
+    var dueDate = invoice.due_date ? invoice.due_date : '';
+
+
+    doc.setFontSize('7');
+    doc.setFontType("bold");
+    doc.text(marginLeft3, z,invoiceNumber);
+    z=z+15;//doc.internal.getFontSize();
+
+
+    doc.setFontSize('8');
+    doc.setFontType("normal");
+    doc.text(marginLeft3, z,invoiceDate);
+    z=z+15;//doc.internal.getFontSize();
+
+    doc.setFontSize('8');
+    doc.setFontType("normal");
+    doc.text(marginLeft3, z,dueDate);
+    z=z+15;//doc.internal.getFontSize();
+
+    y=z+60;
+//--------------------------------Publishing Table--------------------------------------------------
+    GlobalY=y+30;
+    GlobalY=GlobalY+70;//y+30;
+    SetPdfColor('Black',doc);
+    doc.setFontSize(7);
+    var hasTaxes = false;
+    for (var i=0; i<invoice.invoice_items.length; i++)
+    {
+        var item = invoice.invoice_items[i];
+        if ((item.tax && item.tax.rate > 0) || (item.tax_rate && parseFloat(item.tax_rate) > 0)) {
+            hasTaxes = true;
+            break;
+        }
+    }
+    if (hasTaxes)
+    {
+        descriptionLeft -= 20;
+        unitCostRight -= 40;
+        qtyRight -= 40;
+    }
+
+    var costX = unitCostRight - (doc.getStringUnitWidth('Unit Cost') * doc.internal.getFontSize());
+    var qtyX = qtyRight - (doc.getStringUnitWidth('Quantity') * doc.internal.getFontSize());
+    var taxX = taxRight - (doc.getStringUnitWidth('Tax') * doc.internal.getFontSize());
+    var totalX = lineTotalRight - (doc.getStringUnitWidth('Line Total') * doc.internal.getFontSize());
+
+    tableTop=GlobalY;//redefine this to dynamic value
+
+    doc.setFontSize(12);
+    doc.setFontType("bold");
+
+    doc.text(tableLeft, tableTop, 'Item');
+    doc.text(descriptionLeft, tableTop, 'Description');
+    doc.text(costX, tableTop, 'Unit Cost');
+    doc.text(qtyX, tableTop, 'Quantity');
+    doc.text(totalX, tableTop, 'Line Total');
+
+    if (hasTaxes)
+    {
+        doc.text(taxX, tableTop, 'Tax');
+    }
+
+
+    doc.setFontSize(7);
+
+    /* line items */
+
+    var line = 1;
+    var total = 0;
+    var shownItem = false;
+
+
+    GlobalY=GlobalY+24; //padding from top
+
+    var FontSize=7;
+    doc.setFontSize(FontSize);
+    doc.setFontType("normal");
+
+    var MaxLinesPerPage=40;
+
+
+
+    for (var i=0; i<invoice.invoice_items.length; i++) {
+
+        var item = invoice.invoice_items[i];
+
+
+        var cost = formatMoney(item.cost, currencyId, true);
+        var qty = NINJA.parseFloat(item.qty) ? NINJA.parseFloat(item.qty) + '' : '';
+        var notes = item.notes;
+        var productKey = item.product_key;
+        var tax = 0;
+        if (item.tax && parseFloat(item.tax.rate)) {
+            tax = parseFloat(item.tax.rate);
+        } else if (item.tax_rate && parseFloat(item.tax_rate)) {
+            tax = parseFloat(item.tax_rate);
+        }
+
+        // show at most one blank line
+        if (shownItem && (!cost || cost == '0.00') && !qty && !notes && !productKey) {
+            continue;
+        }
+        shownItem = true;
+
+        // process date variables
+        notes = processVariables(notes);
+        productKey = processVariables(productKey);
+
+        var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty);
+        if (tax) {
+            lineTotal += lineTotal * tax / 100;
+        }
+        if (lineTotal) {
+            total += lineTotal;
+        }
+        lineTotal = formatMoney(lineTotal, currencyId, true);
+
+        var costX = unitCostRight - (doc.getStringUnitWidth(cost) * doc.internal.getFontSize());
+        var qtyX = qtyRight - (doc.getStringUnitWidth(qty) * doc.internal.getFontSize());
+        var taxX = taxRight - (doc.getStringUnitWidth(tax+'%') * doc.internal.getFontSize());
+        var totalX = lineTotalRight - (doc.getStringUnitWidth(lineTotal) * doc.internal.getFontSize());
+
+
+        length=doc.splitTextToSize(item.notes, 200).length;
+        var h=length*FontSize;
+        MaxGlobalY=750;
+        if (h+GlobalY > MaxGlobalY) {
+
+            tableTop = 40;
+            GlobalY=tableTop;
+
+            doc.addPage();
+            Report2AddFooter(invoice,doc);
+        }
+
+        if ((i%2)===0){
+            doc.setLineWidth(0.5);
+            doc.setDrawColor(240,240,240);
+            doc.setFillColor(240,240,240);
+
+
+
+            var x1 = tableLeft-tablePadding ;
+            var y1 = GlobalY-FontSize;
+            var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5;
+            var h2 = doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding;
+            doc.rect(x1, y1, w2, h2, 'FD');
+        }
+        else
+        {
+            doc.setLineWidth(0.5);
+            doc.setDrawColor(251,251,251);
+            doc.setFillColor(251,251,251);
+
+
+            var x1 = tableLeft-tablePadding ;
+            var y1 = GlobalY-FontSize;
+            var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5;
+            var h2 = doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding;
+            doc.rect(x1, y1, w2, h2, 'FD');
+        }
+
+        x=GlobalY;
+
+        GlobalY=GlobalY+h+tablePadding*2;
+
+
+        SetPdfColor('SomeGreen',doc);
+        doc.text(tableLeft, x, productKey);
+
+        SetPdfColor('Black',doc);
+        doc.text(descriptionLeft, x, notes);
+
+        doc.text(costX, x, cost);
+        doc.text(qtyX, x, qty);
+        doc.text(totalX, x, lineTotal);
+
+        if (tax) {
+            doc.text(taxX, x, tax+'%');
+        }
+
+
+        line=line+length;
+    }
+//-------------------------------Publishing Document balance------------------------------------------
+
+
+    x += 16+50;
+
+    doc.setFontType("bold");
+    MsgRightAlign=400;
+
+
+
+    GlobalY=x;
+
+    doc.setLineWidth(0.3);
+
+    doc.setDrawColor(251,251,251);
+    doc.setFillColor(251,251,251);
+    var x1 = tableLeft-tablePadding*2 ;
+    var y1 = GlobalY-FontSize-tablePadding;
+    var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5;
+    var h2 = doc.internal.getFontSize()*3+tablePadding*2;
+    doc.rect(x1, y1, w2, h2, 'FD');
+
+
+    Msg='Total';
+    var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize());
+    doc.text(TmpMsgX, x, Msg);
+
+    doc.setFontType("normal");
+    AmountText = formatMoney(total , currencyId);
+    headerLeft=headerRight+400;
+    var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize());
+    doc.text(AmountX, x, AmountText);
+
+
+
+
+    x += doc.internal.getFontSize()*2;
+
+    Msg='Amount Payed';
+    var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize());
+    doc.text(TmpMsgX, x, Msg);
+
+
+
+    AmountText = formatMoney(paid_to_date , currencyId);
+    headerLeft=headerRight+400;
+    var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize());
+    doc.text(AmountX, x, AmountText);
+
+
+
+
+    doc.setFontType("bold");
+
+    doc.setFontSize(12);
+    x += doc.internal.getFontSize()*4;
+    Msg='Amount 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;
+    var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize());
+    doc.text(AmountX, x, AmountText);
+
+
+
+
+
+
+    return doc;
+}
+
+
+
 function SetPdfColor(color,doc)
 {
 
     if (color=='LightBlue') {
-       return doc.setTextColor(41,156, 194);
+        return doc.setTextColor(41,156, 194);
     }
 
     if (color=='Black') {
-        return doc.setTextColor(0,0,0);//select color black
+        return doc.setTextColor(46,43,43);//select color black
     }
     if (color=='GrayLogo') {
-        return doc.setTextColor(207,209, 210);//select color Custom Report GRAY
+        //return doc.setTextColor(207,209, 210);//select color Custom Report GRAY
+        return doc.setTextColor(207,241, 241);//select color Custom Report GRAY
     }
 
+    if (color=='GrayBackground') {
+        //return doc.setTextColor(207,209, 210);//select color Custom Report GRAY
+        return doc.setTextColor(251,251, 251);//select color Custom Report GRAY
+    }
+
+
+
     if (color=='GrayText') {
         return doc.setTextColor(161,160,160);//select color Custom Report GRAY Colour
     }
 
+    if (color=='White') {
+        return doc.setTextColor(255,255,255);//select color Custom Report GRAY Colour
+    }
+
+
+
+    if (color=='SomeGreen') {
+        return doc.setTextColor(54,164,152);//select color Custom Report GRAY Colour
+    }
+
+
+
+
+    if (color=='LightGrayReport2-gray') {
+        return doc.setTextColor(240,240,240);//select color Custom Report GRAY Colour
+    }
+
+    if (color=='LightGrayReport2-white') {
+        return doc.setTextColor(251,251,251);//select color Custom Report GRAY Colour
+    }
+
+
+
 
     alert('color is not defined');
     return false;
@@ -1188,10 +1795,49 @@ function SetPdfColor(color,doc)
 
 
 
+function Report1AddFooter (doc)
+{
+}
+
+function Report2AddFooter (invoice,doc)
+{
+
+    doc.setLineWidth(0.5);
+    doc.setDrawColor(41,37,37);
+    doc.setFillColor(41,37,37);
+
+
+    // return doc.setTextColor(240,240,240);//select color Custom Report GRAY Colour
 
 
 
 
+    var x1 = 0;//tableLeft-tablePadding ;
+
+    var y1 = 750;
+
+    var w2 = 596;
+    var h2 = 94;//doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding;
 
 
 
+    doc.rect(x1, y1, w2, h2, 'FD');
+
+
+    if (invoice.imageLogo2)
+    {
+        pageHeight=820;
+        var left = 250;//headerRight ;
+        y=pageHeight-invoice.imageLogoHeight2;
+        var headerRight=350;
+
+        var left = headerRight - invoice.imageLogoWidth2;
+        doc.addImage(invoice.imageLogo2, 'JPEG', left, y, invoice.imageLogoWidth2, invoice.imageLogoHeight2);
+
+
+    }
+
+
+
+}
+