tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging conflicts

Browse source
This commit is contained in:
Hillel Coren 2014-03-02 08:44:33 +02:00
parent 6beb35a710
commit cfa06662f8
1 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
public/js/script.js
View file

@ -2570,20 +2570,6 @@ if (i!=0&NewPageFlag==0)
<<<<<<< HEAD
doc.setLineWidth(0.3);
doc.setDrawColor(63,60,60);
doc.setFillColor(63,60,60);
var x1 = tableLeft-tablePadding*2 +14;
var y1 = x+ doc.internal.getFontSize()*4;
var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5;
var h2 = doc.internal.getFontSize()*3+tablePadding*2;
doc.rect(x1, y1, w2, h2, 'FD');
=======
>>>>>>> 39774ccaaf7f263310fd072be78ec5508a4188bf
doc.setLineWidth(0.3);
@ -2602,12 +2588,9 @@ if (i!=0&NewPageFlag==0)
<<<<<<< HEAD
=======
>>>>>>> 39774ccaaf7f263310fd072be78ec5508a4188bf
doc.setFontType("bold");
SetPdfColor('White',doc);
doc.setFontSize(12);