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

diff --git a/conf/invoice_latex b/conf/invoice_latex
index b169b617f..70b36b13d 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -258,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}}();