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

Merge pull request #24 from alltheworld/reportfix3

Browse Source 
Reportfix3
This commit is contained in:
Hillel Coren 2014-03-05 18:59:02 +02:00
commit baea73f8c6
1 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
public/js/script.js
View File

@ -965,12 +965,12 @@ y2=GlobalY;
doc.text(costX, tableTop, 'Unit Cost'); doc.text(costX, tableTop, 'Unit Cost');
doc.text(qtyX, tableTop, 'Quantity'); doc.text(qtyX, tableTop, 'Quantity');
doc.text(totalX, tableTop, 'Line Total'); doc.text(totalX, tableTop, 'Line Total');
doc.setFontType("normal");
if (hasTaxes) if (hasTaxes)
{ {
doc.text(taxX, tableTop, 'Tax'); doc.text(taxX, tableTop, 'Tax');
} }
doc.setFontType("normal");
doc.setFontSize(7); doc.setFontSize(7);
@ -1215,11 +1215,8 @@ y2=GlobalY;
Msg='Balance Due'; Msg='Balance Due';
var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize());
doc.text(TmpMsgX, x, Msg); doc.text(TmpMsgX, x, Msg);
SetPdfColor('LightBlue',doc); SetPdfColor('LightBlue',doc);
AmountText = formatMoney(balance , currencyId); AmountText = formatMoney(balance , currencyId);
headerLeft=headerRight+400; headerLeft=headerRight+400;
@ -1231,6 +1228,47 @@ y2=GlobalY;
if (terms )
{
GlobalY=GlobalY+100;
length=doc.splitTextToSize( terms, 200).length;
FontSize=10;
var h=length*FontSize;
//check do we need to go to next page
MinHeight=700;
if (GlobalY+h > MinHeight) {
GlobalY=Report1AddNewPage(invoice,account,doc);
}
SetPdfColor('Black',doc);
doc.text(40, GlobalY, terms);
GlobalY=GlobalY+h;
}
if (public_notes )
{
//GlobalY=GlobalY+100;
length=doc.splitTextToSize( public_notes, 200).length;
FontSize=10;
var h=length*FontSize;
//check do we need to go to next page
MinHeight=700;
if (GlobalY+h > MinHeight) {
GlobalY=Report1AddNewPage(invoice,account,doc);
}
SetPdfColor('Black',doc);
doc.text(40, GlobalY, public_notes);
GlobalY=GlobalY+h;
}
return doc; return doc;
} }