X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=2547ec11f26f8554e63a003be9116f9fee55d8e5;hb=5214a5560240667a3a914c45df046b420926a5ec;hp=4d55f700230bcc4190a0a7aad5ebc0706578114a;hpb=820fe0ac288d4f2bb975b7f58ee02baefd96ed24;p=freeside.git

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 4d55f7002..2547ec11f 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -190,7 +190,10 @@
 
 % my @exempt_groups = grep /\S/, $conf->config('tax-cust_exempt-groups');
 
-% unless ( $conf->exists('cust_class-tax_exempt') ) {
+% unless (    $conf->exists('cust_class-tax_exempt')
+%          || $conf->exists('tax-cust_exempt-groups-require_individual_nums')
+%        )
+% {
     <TR>
       <TD ALIGN="right"><% mt('Tax exempt') |h %><% @exempt_groups ? ' ('.emt('all taxes').')' : '' %></TD>
       <TD BGCOLOR="#ffffff"><% $cust_main->tax ? $yes : $no %></TD>
@@ -198,9 +201,12 @@
 % }
 
 % foreach my $exempt_group ( @exempt_groups ) {
+%   my $cust_main_exemption = $cust_main->tax_exemption($exempt_group);
     <TR>
       <TD ALIGN="right"><% mt('Tax exempt') |h %> (<% $exempt_group %> taxes)</TD>
-      <TD BGCOLOR="#ffffff"><% $cust_main->tax_exemption($exempt_group) ? $yes : $no %></TD>
+      <TD BGCOLOR="#ffffff"><% $cust_main_exemption ? $yes : $no %>
+        <% $cust_main_exemption ? $cust_main_exemption->exempt_number : '' |h %>
+      </TD>
     </TR>
 % }
 
@@ -211,21 +217,27 @@
 </TR>
 % }
 <TR>
-  <TD ALIGN="right"><% mt('Postal invoices') |h %></TD>
+  <TD ALIGN="right"><% mt('Postal mail invoices') |h %></TD>
   <TD BGCOLOR="#ffffff">
     <% ( grep { $_ eq 'POST' } @invoicing_list ) ? $yes : $no %>
   </TD>
 </TR>
 <TR>
-  <TD ALIGN="right"><% mt('FAX invoices') |h %></TD>
+  <TD ALIGN="right"><% mt('Fax invoices') |h %></TD>
   <TD BGCOLOR="#ffffff">
     <% ( grep { $_ eq 'FAX' } @invoicing_list ) ? $yes : $no %>
   </TD>
 </TR>
-% unless ( $conf->exists('cust-email-high-visibility')) {
 <TR>
   <TD ALIGN="right"><% mt('Email invoices') |h %></TD>
   <TD BGCOLOR="#ffffff">
+    <% $cust_main->invoice_noemail ? $no : $yes %>
+  </TD>
+</TR>
+% unless ( $conf->exists('cust-email-high-visibility')) {
+<TR>
+  <TD ALIGN="right"><% mt('Email address(es)') |h %></TD>
+  <TD BGCOLOR="#ffffff">
     <% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || $no %>
   </TD>
 </TR>