freeside inc. web services for address normalizaion and printing, RT#33849

[freeside.git] / conf / invoice_latex

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