user-defined site ID / location codes per location, RT#30856, RT#27545

2 files changed, 4 insertions, 0 deletions

diff --git a/conf/invoice_html b/conf/invoice_html
index 35de6cf09..795242d5d 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -115,6 +115,8 @@
           $OUT .= '<p class="allcaps"><b>';
           my $sectionhead;
           if ( $section->{'location'} ) {
+            $sectionhead .= $section->{'location'}{'label_prefix'}. ': '.
+              if length($section->{'location'}{'label_prefix'});
             $sectionhead = $section->{'location'}{'address1'};
             $sectionhead .= ', '.$section->{'location'}{'address2'}
               if length($section->{'location'}{'address2'});
diff --git a/conf/invoice_latex b/conf/invoice_latex
index 70b36b13d..6a5b53dd5 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -259,6 +259,8 @@
       $OUT .= '\begin{longtable}{cllllllr}';

       $OUT .= '\caption*{ ';

       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'});