Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

report fixes

Browse Source
This commit is contained in:
alltheworld 2014-03-03 21:18:31 +02:00
parent 31377eb226
commit da2ad78db4
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
public/js/script.js
View File

@ -960,14 +960,16 @@ function GetReportTemplate1 (invoice,checkMath)
if (h+GlobalY > MaxGlobalY) { if (h+GlobalY > MaxGlobalY) {
tableTop = 40; //tableTop = 40;
GlobalY=tableTop; //GlobalY=tableTop;
//var MaxLinesPerPage=70; //var MaxLinesPerPage=70;
GlobalY=Report1AddNewPage(invoice,account,doc);
/*
doc.addPage(); doc.addPage();
if (invoice.imageLogo1) if (invoice.imageLogo1)
{ {
@ -980,7 +982,7 @@ function GetReportTemplate1 (invoice,checkMath)
doc.addImage(invoice.imageLogo1, 'JPEG', left, y, invoice.imageLogoWidth1, invoice.imageLogoHeight1); doc.addImage(invoice.imageLogo1, 'JPEG', left, y, invoice.imageLogoWidth1, invoice.imageLogoHeight1);
} }*/
} }
@ -2649,18 +2651,12 @@ if (i!=0&NewPageFlag==0)
function Report3AddHeader (invoice,account,doc) function Report3AddHeader (invoice,account,doc)
{ {
doc.setLineWidth(0.5); doc.setLineWidth(0.5);
//doc.setFillColor( 46,43,43); //doc.setFillColor( 46,43,43);
//doc.setFillColor( 46,43,43); //doc.setFillColor( 46,43,43);
doc.setDrawColor(242,101,34); doc.setDrawColor(242,101,34);
doc.setFillColor(242,101,34); doc.setFillColor(242,101,34);
var x1 =0; var x1 =0;
var y1 = 0; var y1 = 0;
var w2 = 595; var w2 = 595;
var h2 = 140; var h2 = 140;
doc.rect(x1, y1, w2, h2, 'FD'); doc.rect(x1, y1, w2, h2, 'FD');
@ -2669,11 +2665,8 @@ function Report3AddHeader (invoice,account,doc)
//second column //second column
doc.setFontType("bold"); doc.setFontType("bold");
var MaxWidth=594; var MaxWidth=594;
var LineOne= account.name; var LineOne= account.name;
var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineOne) * doc.internal.getFontSize()); var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineOne) * doc.internal.getFontSize());
if (account.name) { if (account.name) {
//SetPdfColor('SomeGreen',doc); //SetPdfColor('SomeGreen',doc);
@ -2691,14 +2684,16 @@ function Report3AddHeader (invoice,account,doc)
function Report1AddNewPage(invoice,account,doc) function Report1AddNewPage(invoice,account,doc)
{ {
//alert(1);
doc.addPage(); doc.addPage();
if (invoice.imageLogo1)
{
pageHeight=820;
y=pageHeight-invoice.imageLogoHeight1;
var left = 20;//headerRight - invoice.imageLogoWidth1;
doc.addImage(invoice.imageLogo1, 'JPEG', left, y, invoice.imageLogoWidth1, invoice.imageLogoHeight1);
}
GlobalY = 40; GlobalY = 40;
return GlobalY; return GlobalY;
} }
function Report1AddFooter(invoice,account,doc)
{
alert(2);
}