Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-16 15:54:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixing conflicts

Browse Source
This commit is contained in:
Hillel Coren 2014-03-02 08:42:08 +02:00
commit 6beb35a710
1 changed files with 306 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/js/script.js
View File

@ -2570,6 +2570,20 @@ 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); doc.setLineWidth(0.3);
@ -2588,9 +2602,12 @@ if (i!=0&NewPageFlag==0)
<<<<<<< HEAD
=======
>>>>>>> 39774ccaaf7f263310fd072be78ec5508a4188bf
doc.setFontType("bold"); doc.setFontType("bold");
SetPdfColor('White',doc); SetPdfColor('White',doc);
doc.setFontSize(12); doc.setFontSize(12);