Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity

report fixes

Browse Source
This commit is contained in:
alltheworld 2014-03-03 17:49:10 +02:00
parent 2f207f8a7f
commit 31377eb226
1 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
public/js/script.js
View File

@ -900,7 +900,7 @@ function GetReportTemplate1 (invoice,checkMath)
var shownItem = false; var shownItem = false;
GlobalY=GlobalY+14; //padding from top GlobalY=GlobalY+14+10; //padding from top
var FontSize=7; var FontSize=7;
doc.setFontSize(FontSize); doc.setFontSize(FontSize);
@ -1034,8 +1034,20 @@ function GetReportTemplate1 (invoice,checkMath)
//-------------------------------Publishing Document balance------------------------------------------ //-------------------------------Publishing Document balance------------------------------------------
//check do we need to go to next page
MinHeight=700;
if (GlobalY > MinHeight) {
GlobalY=Report1AddNewPage(invoice,account,doc);
}
@ -1047,19 +1059,22 @@ function GetReportTemplate1 (invoice,checkMath)
GlobalY=x; // GlobalY=x;
GlobalY=GlobalY+25;
doc.setLineWidth(0.3); doc.setLineWidth(0.3);
doc.setDrawColor(251,251,251); doc.setDrawColor(251,251,251);
doc.setFillColor(251,251,251); doc.setFillColor(251,251,251);
var x1 = tableLeft-tablePadding*2+14 ; var x1 = tableLeft-tablePadding*2+14 ;
var y1 = GlobalY-FontSize-tablePadding; var y1 = GlobalY-FontSize-tablePadding;
var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5;
var h2 = doc.internal.getFontSize()*3+tablePadding*2; var h2 = doc.internal.getFontSize()*3+tablePadding*2;
doc.rect(x1, y1, w2, h2, 'FD'); doc.rect(x1, y1, w2, h2, 'FD');
x=y1+FontSize+tablePadding;
Msg='Subtotal'; Msg='Subtotal';
@ -1122,6 +1137,19 @@ function GetReportTemplate1 (invoice,checkMath)
} }
function GetReportTemplate2 (invoice,checkMath) function GetReportTemplate2 (invoice,checkMath)
{ {
var doc=false; var doc=false;
@ -1794,7 +1822,6 @@ function SetPdfColor(color,doc)
} }
function Report2AddFooter (invoice,doc) function Report2AddFooter (invoice,doc)
{ {
@ -2660,3 +2687,18 @@ function Report3AddHeader (invoice,account,doc)
} }
function Report1AddNewPage(invoice,account,doc)
{
//alert(1);
doc.addPage();
GlobalY = 40;
return GlobalY;
}
function Report1AddFooter(invoice,account,doc)
{
alert(2);
}