X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=795242d5dcc66807fd52f72aefb48cc25ccfa4d4;hb=5556814b7ff65b0a4837390be9331e1841189427;hp=1d53683ad67011f5d63194c20f9290cf38e146e5;hpb=62b12e8b09608b7081ffd596be899fafb5c2403f;p=freeside.git

diff --git a/conf/invoice_html b/conf/invoice_html
index 1d53683ad..795242d5d 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -11,7 +11,7 @@
 .invoice_desc_more TD { font-weight: bold; font-size: 10pt }
 .invoice_extdesc TD { font-size: 8pt }
 .invoice_totaldesc TD { font-size: 10pt; empty-cells: show }
-.allcaps { text-transform:uppercase }
+.allcaps { text-transform:uppercase; font-size: 12pt }
 </STYLE>
 
 <table class="invoice" bgcolor="#ffffff" WIDTH=625 CELLSPACING=8><tr><td>
@@ -112,13 +112,27 @@
         unless ($section->{'summarized'}) {
           $OUT .= '</table>' if ( $notfirst || $section->{'pretotal'} && !$summary );
           $OUT .= '<table><tr><td>';
-          my $sectionhead = $section->{'description'} || emt('Charges');
-          $OUT .=
-              '<p class="allcaps"><b><font size="+1">'. substr($sectionhead,0,1).
+          $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'});
+            $sectionhead .= ', ' .
+                            $section->{'location'}{'city'} . ', ' .
+                            $section->{'location'}{'state'} . ' ' .
+                            $section->{'location'}{'zip'};
+            $OUT .= $sectionhead;
+          } else {
+            $sectionhead = $section->{'description'} || emt('Charges');
+            $OUT .= '<font size="+1">'. substr($sectionhead,0,1).
               '</font><font size="+0">'. substr($sectionhead,1).
-              '</font></b>'.
-              '<p>'.
-              '</td></tr></table>';
+          
+              '</font>';
+          }
+          $OUT .= '</b></p></td></tr></table>';
 
           $OUT .=
             '<table class="invoice_longtable" CELLSPACING=0 WIDTH="100%">'.
@@ -132,8 +146,8 @@
             $OUT .=  '<th align="center">' . emt('Ref') . '</th>'.
                      '<th align="left">' . emt('Description') . '</th>'.
                      ( $unitprices 
-                       ? '<th align="left">' . emt('Unit Price') . '</th>'.
-                         '<th align="left">' . emt('Quantity') . '</th>'
+                       ? '<th align="right">' . emt('Unit Price') . '</th>'.
+                         '<th align="right">' . emt('Quantity') . '</th>'
                         : '' ).
                      '<th align="right">' . emt('Amount') . '</th>';
           }
@@ -158,8 +172,8 @@
                        ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). '</td>'.
                        '<td align="left">'. $line->{'description'}. '</td>'.
                        ( $unitprices 
-                           ? '<td align="left">'. $line->{'unit_amount'}. '</td>'.
-                             '<td align="left">'. $line->{'quantity'}. '</td>'
+                           ? '<td align="right">'. $line->{'unit_amount'}. '</td>'.
+                             '<td align="right">'. $line->{'quantity'}. '</td>'
                            : ''
                        ).
 
@@ -191,7 +205,7 @@
           }
 
 
-          if ($section->{'description'} || $multisection) {
+          if ($section->{'description'} || $multisection and !$section->{no_subtotal}) {
             my $style = 'border-top: 3px solid #000000;'.
                         'border-bottom: 3px solid #000000;';
             $OUT .=