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

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