payment terms localiation, #71549

[freeside.git] / conf / invoice_latex

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 4df858d..fd0f952 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
@@ -66,7 +66,7 @@
   }\r
 }\r
 \r
-\newcommand{\extracouponspace}{[@-- defined($extracouponspace) ? $extracouponspace : '3.6cm' --@]}\r
+\newcommand{\extracouponspace}{[@-- defined($extracouponspace) ? $extracouponspace : '2.7in' --@]}\r
 \r
 % Adjust the inset of the mailing address\r
 \newcommand{\addressinset}[1][]{\hspace{1.0cm}}\r
@@ -95,7 +95,9 @@
     $OUT .= '\vspace{-\extracouponspace}';\r
     $OUT .= '\rule[0.5em]{\textwidth}{\footrulewidth}\\\\';\r
     $OUT .= $coupon;\r
-    $OUT .= '\vspace{'. $couponfootsep. '}' if defined($couponfootsep);\r
+    $OUT .= '\vspace{'.\r
+      (defined($couponfootsep) ? $couponfootsep : '0.2in') .\r
+      '}';\r
   }\r
   '';\r
 --@] [@-- $smallerfooter ? '\scriptsize{' : '\small{' --@]\r
@@ -124,10 +126,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
@@ -209,7 +211,7 @@
   \hline\r
 }\r
 \r
-}% ...description...\r
+% ...description...\r
 \newcommand{\FSdesc}[5]{\r
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &\r
   \multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\textbf{#2}} &\r
@@ -270,7 +272,7 @@
   }\r
 --@]\r
 \begin{flushright}\r
-[@-- $terms ? emt('Terms') .": $terms" : '' --@]\\\r
+[@-- $terms ? emt('Terms') . ': ' . emt($terms) : '' --@]\\\r
 [@-- $po_line --@]\\\r
 \end{flushright}\r
 \end{minipage}}\r
@@ -376,7 +378,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