X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_latex;h=b64cc690b31798a6360bcf34b130a25c195afbf2;hb=497739310211650a12becc4ca7954c2b055499c8;hp=4df858d22ac2f7ed5b3f027baf9583b23ad5b97f;hpb=9896275b96170e2a97e313e64c7aa5bfaf12a087;p=freeside.git

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 4df858d22..b64cc690b 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -39,7 +39,7 @@
 
 \addtolength{\voffset}{-0.0cm}		% top margin to top of header
 \addtolength{\hoffset}{-0.6cm}		% left margin on page
-\addtolength{\topmargin}{[@-- defined($topmargin) ? $topmargin : '-1.25cm' --@]}
+\addtolength{\topmargin}{[@-- defined($topmargin) ? $topmargin : '-1.00cm' --@]}
 \setlength{\headheight}{2.0cm} 		% height of header
 \setlength{\headsep}{[@-- defined($headsep) ? $headsep : '1.0cm' --@]}
 \setlength{\footskip}{1.0cm}		% bottom of footer from bottom of text
@@ -124,10 +124,10 @@
     \returninset
     \makebox{
       \begin{tabular}{ll}
-        \includegraphics{[@-- $logo_file --@]} & [@-- $verticalreturnaddress ? '\\\\' : '' --@]
         \begin{minipage}[b]{5.5cm}
 [@-- $returnaddress --@]
-        \end{minipage}\\
+        \end{minipage} &
+        \includegraphics{[@-- $logo_file --@]}\\
       \end{tabular}
     }
   }
@@ -376,7 +376,7 @@
             {' . $line->{'description'} . '}
             {' . $line->{'quantity'} . '}
             {' . $minutes . 'm ' . $seconds . 's' . '}
-            {' . '\dollar' . $line->{'amount'} . '}';
+            {' . $line->{'amount'} . '}';
         } else {
           $OUT .= '\FSdesc'.
                   '{}'.