X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=conf%2Finvoice_latex;h=70b36b13dfdbf0c0a9ec2da57e4d8b6d36c883fc;hp=533e8340d94895f7da033bacd868b8baecfd1e78;hb=55753aaf5b1189c06a99fe5e0791fc33316df06f;hpb=f3e0ac2b009c4edd5692cb587ff709dac2223ebe

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 533e8340d..70b36b13d 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -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) --@]}} & \\
@@ -254,7 +258,19 @@
         if $coupon;
       $OUT .= '\begin{longtable}{cllllllr}';
       $OUT .= '\caption*{ ';
-      $OUT .= ($section->{'description'}) ? $section->{'description'}: emt('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}}();