diff options
Diffstat (limited to 'conf/invoice_latex')
| -rw-r--r-- | conf/invoice_latex | 14 |
1 files changed, 13 insertions, 1 deletions
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}}();
|