X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_latex;h=99d12d5c722225088c49da3fb153993f73163345;hb=89f9957267f05520fc676c378694383d16eedeb1;hp=772c2eb95c40cf29d2d22a18403f73deab52ab9d;hpb=cd3ed01671d5e1f9332c494abbf4bb110aabe1e3;p=freeside.git

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 772c2eb95..99d12d5c7 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -19,7 +19,7 @@
 
 \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}
@@ -127,7 +127,11 @@
   \ifthenelse{\equal{\thepage}{1}}
   { % First page
     \begin{tabular}{ccc}
-    [@-- join(' & ', emt('Invoice date'), emt('Invoice #'), emt('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{[@-- emt($notice_name) --@]}} & \\
@@ -164,8 +168,9 @@
 \newcommand{\FSdescriptionlength} { [@-- $unitprices ? '8.2cm' : '12.8cm' --@] }
 \newcommand{\FSdescriptioncolumncount} { [@-- $unitprices ? '4' : '6' --@] }
 \newcommand{\FSunitcolumns}{ [@-- 
-  $unitprices 
-  ? '\makebox[2.5cm][l]{\textbf{~~'.emt('Unit Price').'}}&\makebox[1.4cm]{\textbf{~'.emt('Quantity').'}}&' 
+  $unitprices
+  ? '\makebox[2.5cm][r]{\textbf{~~' . emt('Unit Price') . '}} &' .
+    '\makebox[1.4cm]{\textbf{~' . emt('Quantity') . '}} & ' 
   : '' --@] }
 
 \newcommand{\FShead}{
@@ -182,11 +187,11 @@
 \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{#3}} &'."\n".
                    '  \multicolumn{1}{r}{\textbf{#4}} &'."\n"
                  : ''
 --@]
-  \multicolumn{1}{r}{\textbf{\dollar #5}}\\
+  \multicolumn{1}{r}{\textbf{#5}}\\
 }
 % ...extended description...
 \newcommand{\FSextdesc}[1]{
@@ -253,7 +258,21 @@
         if $coupon;
       $OUT .= '\begin{longtable}{cllllllr}';
       $OUT .= '\caption*{ ';
-      $OUT .= ($section->{'description'}) ? $section->{'description'}: emt('Charges');
+      if ($section->{'location'}) {
+        $OUT .= $section->{'location'}{'label_prefix'}. ': '
+          if length($section->{'location'}{'label_prefix'});
+        $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}}();
@@ -314,10 +333,17 @@
         } else {
           $OUT .= '\FSdesc'.
                   '{' . ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ) . '}'.
-                  '{' . $line->{'description'} . '}' .
-                  '{' . ( $unitprices ? $line->{'unit_amount'} : '' ) . '}'.
-                  '{' . ( $unitprices ? $line->{'quantity'} : ''  ) . '}' .
-                  '{' . $line->{'amount'} . "}${rowbreak}\n";
+                  '{' . $line->{'description'} . '}' ;
+          if ( $unitprices and length($line->{'unit_amount'}) ) {
+            # then show the unit amount and quantity
+            $OUT .= 
+                '{\\dollar' . $line->{'unit_amount'} . '}'.
+                '{'         . $line->{'quantity'}    . '}';
+          } else {
+            # leave those columns blank
+            $OUT .= '{}{}';
+          }
+          $OUT .= '{\\dollar' . $line->{'amount'} . "}${rowbreak}\n";
         }
         $lastref = $line->{'ref'};