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

fix

Browse Source 
terms and notes
This commit is contained in:
alltheworld 2014-03-09 04:06:00 +02:00
parent 1f7f331a80
commit 04e7b05d03
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
public/js/script.js
View File

@ -1637,15 +1637,39 @@ y2=GlobalY;
//put terms and notes on free little block
lengthTerms=doc.splitTextToSize( terms, 200).length;
lengthNotes=doc.splitTextToSize( public_notes, 200).length;
if (lengthTerms<4)
if (terms )
{ {
SetPdfColor('Black',doc);
doc.text(40, GlobalY, terms);
GlobalY=GlobalY+h;
}
if (lengthNotes<4)
{ GlobalY=GlobalY+48;
SetPdfColor('Black',doc);
doc.text(40, GlobalY, public_notes);
GlobalY=GlobalY+h;
}
GlobalY=GlobalY+100; GlobalY=GlobalY+100;
if (lengthTerms>3)
if (terms )
{
//GlobalY=GlobalY+100;
length=doc.splitTextToSize( terms, 200).length; length=doc.splitTextToSize( terms, 200).length;
FontSize=10; FontSize=9;
var h=length*FontSize; var h=length*FontSize;
//check do we need to go to next page //check do we need to go to next page
@ -1658,20 +1682,24 @@ y2=GlobalY;
SetPdfColor('Black',doc); SetPdfColor('Black',doc);
doc.text(40, GlobalY, terms); doc.text(40, GlobalY, terms);
GlobalY=GlobalY+h; GlobalY=GlobalY+h;
GlobalY=GlobalY+20;
} }
if (lengthNotes>3)
if (public_notes ) if (public_notes )
{ {
//GlobalY=GlobalY+100;
length=doc.splitTextToSize( public_notes, 200).length; length=doc.splitTextToSize( public_notes, 200).length;
FontSize=10; FontSize=9;
var h=length*FontSize; var h=length*FontSize;
//check do we need to go to next page //check do we need to go to next page
MinHeight=700; MinHeight=700;
if (GlobalY+h > MinHeight) { if (GlobalY+h > MinHeight) {
GlobalY=Report1AddNewPage(invoice,account,doc); GlobalY=Report1AddNewPage(invoice,account,doc);
GlobalY=GlobalY+20;
} }
SetPdfColor('Black',doc); SetPdfColor('Black',doc);