X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=conf%2Finvoice_latex;h=37f59d2eec644bde416469dc8deecfe26bcecd23;hp=d37eeba3adc904ec81a5e8b789d05f1c77102f40;hb=62b12e8b09608b7081ffd596be899fafb5c2403f;hpb=40a7b3dc653e099f7bd0bd762b649b04c4432db2

diff --git a/conf/invoice_latex b/conf/invoice_latex
index d37eeba3a..37f59d2ee 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -21,17 +21,19 @@
 
 \usepackage{fancyhdr,lastpage,ifthen,array,fslongtable,afterpage,caption,multirow,bigstrut}
 \usepackage{graphicx}			% required for logo graphic
+\usepackage[utf8]{inputenc}             % multilanguage support
+\usepackage[T1]{fontenc}
 
 \addtolength{\voffset}{-0.0cm}		% top margin to top of header
 \addtolength{\hoffset}{-0.6cm}		% left margin on page
-\addtolength{\topmargin}{-1.25cm}	% top margin to top of header
+\addtolength{\topmargin}{[@-- defined($topmargin) ? $topmargin : '-1.25cm' --@]}
 \setlength{\headheight}{2.0cm} 		% height of header
-\setlength{\headsep}{1.0cm}		% between header and text
+\setlength{\headsep}{[@-- defined($headsep) ? $headsep : '1.0cm' --@]}
 \setlength{\footskip}{1.0cm}		% bottom of footer from bottom of text
 
 %\addtolength{\textwidth}{2.1in}    	% width of text
 \setlength{\textwidth}{19.5cm}
-\setlength{\textheight}{19.5cm}
+\setlength{\textheight}{[@-- defined($textheight) ? $textheight : '19.5cm' --@]}
 \setlength{\oddsidemargin}{-0.9cm} 	% odd page left margin
 \setlength{\evensidemargin}{-0.9cm} 	% even page left margin
 
@@ -51,7 +53,7 @@
   }
 }
 
-\newcommand{\extracouponspace}{3.6cm}
+\newcommand{\extracouponspace}{[@-- defined($extracouponspace) ? $extracouponspace : '3.6cm' --@]}
 
 % Adjust the inset of the mailing address
 \newcommand{\addressinset}[1][]{\hspace{1.0cm}}
@@ -80,6 +82,7 @@
     $OUT .= '\vspace{-\extracouponspace}';
     $OUT .= '\rule[0.5em]{\textwidth}{\footrulewidth}\\\\';
     $OUT .= $coupon;
+    $OUT .= '\vspace{'. $couponfootsep. '}' if defined($couponfootsep);
   }
   '';
 --@] [@-- $smallerfooter ? '\scriptsize{' : '\small{' --@]
@@ -108,10 +111,10 @@
     \returninset
     \makebox{
       \begin{tabular}{ll}
-        \includegraphics{[@-- $logo_file --@]} &
+        \includegraphics{[@-- $logo_file --@]} & [@-- $verticalreturnaddress ? '\\\\' : '' --@]
         \begin{minipage}[b]{5.5cm}
 [@-- $returnaddress --@]
-        \end{minipage}
+        \end{minipage}\\
       \end{tabular}
     }
   }
@@ -124,10 +127,10 @@
   \ifthenelse{\equal{\thepage}{1}}
   { % First page
     \begin{tabular}{ccc}
-    Invoice date & Invoice \#& Customer\#\\
+    [@-- join(' & ', emt('Invoice date'), emt('Invoice #'), emt('Customer #') ) --@]\\
     \vspace{0.2cm}
     \textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]} & \textbf{[@-- $custnum --@]} \\\hline
-    \rule{0pt}{5ex} &~~ \huge{\textsc{[@-- $notice_name || 'Invoice' --@]}} & \\
+    \rule{0pt}{5ex} &~~ \huge{\textsc{[@-- emt($notice_name) --@]}} & \\
     \vspace{-0.2cm}
      & & \\\hline
     \end{tabular}
@@ -135,7 +138,7 @@
   { % ... pages
     \small{
       \begin{tabular}{lll}
-      Invoice date & Invoice \#& Customer\#\\
+      [@-- join(' & ', emt('Invoice date'), emt('Invoice #'), emt('Customer #') ) --@]\\
       \textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]} & \textbf{[@-- $custnum --@]}\\
       \end{tabular}
     }
@@ -160,28 +163,29 @@
 
 \newcommand{\FSdescriptionlength} { [@-- $unitprices ? '8.2cm' : '12.8cm' --@] }
 \newcommand{\FSdescriptioncolumncount} { [@-- $unitprices ? '4' : '6' --@] }
-\newcommand{\FSunitcolumns}{ [@-- $unitprices ? '\makebox[2.5cm][l]{\textbf{~~Unit Price}}&\makebox[1.4cm]{\textbf{~Quantity}}&' : '' --@] }
+\newcommand{\FSunitcolumns}{ [@-- 
+  $unitprices 
+  ? '\makebox[2.5cm][l]{\textbf{~~'.emt('Unit Price').'}}&\makebox[1.4cm]{\textbf{~'.emt('Quantity').'}}&' 
+  : '' --@] }
 
 \newcommand{\FShead}{
   \hline
   \rule{0pt}{2.5ex}
   \makebox[1.4cm]{\textbf{Ref}} &
-%  \makebox[2.9cm][l]{\textbf{Description}}&
-%  \makebox[1.4cm][l]{}&
-%  \makebox[1.4cm][l]{}&
-%  \makebox[2.5cm][l]{}&
-  \multicolumn{\FSdescriptioncolumncount}{l}{\makebox[\FSdescriptionlength][l]{\textbf{Description}}}&
+  \multicolumn{\FSdescriptioncolumncount}{l}{\makebox[\FSdescriptionlength][l]{\textbf{[@-- emt('Description') --@]}}}&
   \FSunitcolumns
-  \makebox[1.6cm][r]{\textbf{Amount}} \\
+  \makebox[1.6cm][r]{\textbf{[@-- emt('Amount') --@]}} \\
   \hline
 }
 
 % ...description...
 \newcommand{\FSdesc}[5]{
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
-  \multicolumn{4}{l}{\textbf{#2}} &
-  \multicolumn{1}{l}{\textbf{#3}} &
-  \multicolumn{1}{r}{\textbf{#4}} &
+  \multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\textbf{#2}} &
+[@-- $unitprices ? '  \multicolumn{1}{l}{\textbf{#3}} &'."\n".
+                   '  \multicolumn{1}{r}{\textbf{#4}} &'."\n"
+                 : ''
+--@]
   \multicolumn{1}{r}{\textbf{\dollar #5}}\\
 }
 % ...extended description...
@@ -201,7 +205,7 @@
 \addressinset \rule{0.5cm}{0cm} 
 \makebox{
 \begin{minipage}[t]{7.0cm}
-\vspace{0.25cm}
+\vspace{[@-- defined($addresssep) ? $addresssep : '0.25cm' --@]}
 \textbf{[@-- $payname --@]}\\
 \addressline{[@-- $company --@]}
 \addressline{[@-- $address1 --@]}
@@ -214,7 +218,7 @@
 \begin{minipage}[t]{6.4cm}
 [@--
   if ($ship_enable) {
-    $OUT .= '\textbf{Service Address}\\\\';
+    $OUT .= '\textbf{' . emt('Service Address') . '}\\\\';
     $OUT .= "\\addressline{$ship_company}";
     $OUT .= "\\addressline{$ship_address1}";
     $OUT .= "\\addressline{$ship_address2}";
@@ -226,7 +230,7 @@
   }
 --@]
 \begin{flushright}
-Terms: [@-- $terms --@]\\
+[@-- $terms ? emt('Terms') .": $terms" : '' --@]\\
 [@-- $po_line --@]\\
 \end{flushright}
 \end{minipage}}
@@ -249,7 +253,7 @@ Terms: [@-- $terms --@]\\
         if $coupon;
       $OUT .= '\begin{longtable}{cllllllr}';
       $OUT .= '\caption*{ ';
-      $OUT .= ($section->{'description'}) ? $section->{'description'}: 'Charges';
+      $OUT .= ($section->{'description'}) ? $section->{'description'}: emt('Charges');
       $OUT .= '}\\\\';
       if ($section->{header_generator}) {
         $OUT .= &{$section->{header_generator}}();
@@ -257,14 +261,14 @@ Terms: [@-- $terms --@]\\
         $OUT .= '\FShead';
       }
       $OUT .= '\endfirsthead';
-      $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\\';
+      $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}'.emt('Continued from previous page').'}\\\\';
       if ($section->{header_generator}) {
         $OUT .= &{$section->{header_generator}}();
       } else {
         $OUT .= '\FShead';
       }
       $OUT .= '\endhead';
-      $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\\';
+      $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}'.emt('Continued on next page...').'}\\\\';
       $OUT .= '\endfoot';
       $OUT .= '\hline';