X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_latex;h=70b36b13dfdbf0c0a9ec2da57e4d8b6d36c883fc;hb=e9e0cf0989259b94d9758eceff448666a2e5a5cc;hp=27ca80305e0d715a7dffeab9b2d29a3340c738b4;hpb=a859e1e18ebe73086ab5792a2eda05929ad19873;p=freeside.git

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 27ca80305..70b36b13d 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -19,8 +19,10 @@
 
 \documentclass[letterpaper]{article}
 
-\usepackage{fancyhdr,lastpage,ifthen,array,fslongtable,afterpage,caption,multirow,bigstrut}
+\usepackage{fancyhdr,lastpage,ifthen,array,longtable,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
@@ -125,10 +127,14 @@
   \ifthenelse{\equal{\thepage}{1}}
   { % First page
     \begin{tabular}{ccc}
-    Invoice date & Invoice \#& Customer\#\\
+    [@-- join(' & ', ( $no_date   ? '' : emt('Invoice date') ),
+                     ( $no_number ? '' : 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}
@@ -136,7 +142,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}
     }
@@ -161,19 +167,19 @@
 
 \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][r]{\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
 }
 
@@ -181,7 +187,7 @@
 \newcommand{\FSdesc}[5]{
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
   \multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\textbf{#2}} &
-[@-- $unitprices ? '  \multicolumn{1}{l}{\textbf{#3}} &'."\n".
+[@-- $unitprices ? '  \multicolumn{1}{r}{\textbf{\dollar #3}} &'."\n".
                    '  \multicolumn{1}{r}{\textbf{#4}} &'."\n"
                  : ''
 --@]
@@ -217,7 +223,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}";
@@ -229,7 +235,7 @@
   }
 --@]
 \begin{flushright}
-[@-- $terms ? "Terms: $terms" : '' --@]\\
+[@-- $terms ? emt('Terms') .": $terms" : '' --@]\\
 [@-- $po_line --@]\\
 \end{flushright}
 \end{minipage}}
@@ -252,7 +258,19 @@
         if $coupon;
       $OUT .= '\begin{longtable}{cllllllr}';
       $OUT .= '\caption*{ ';
-      $OUT .= ($section->{'description'}) ? $section->{'description'}: 'Charges';
+      if ($section->{'location'}) {
+        $OUT .= $section->{'location'}{'address1'};
+        $OUT .= ', ' . $section->{'location'}{'address2'}
+          if length($section->{'location'}{'address2'});
+        $OUT .= ', ' .
+                $section->{'location'}{'city'} . ', ' .
+                $section->{'location'}{'state'} . '~' .
+                $section->{'location'}{'zip'};
+      } elsif ( $section->{'description'} ) {
+        $OUT .= ($section->{'description'});
+      } else {
+        $OUT .= emt('Charges');
+      }
       $OUT .= '}\\\\';
       if ($section->{header_generator}) {
         $OUT .= &{$section->{header_generator}}();
@@ -260,18 +278,18 @@
         $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';
 
-      if (scalar(@sections) > 1) {
+      if (scalar(@sections) > 1 and !$section->{no_subtotal}) {
         if ($section->{total_generator}) {
           $OUT .= &{$section->{total_generator}}($section);
         } else {