X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=5935da9cdf2a03a82bdd27158fc699a7d912a2fd;hb=b0fd49b9efe2a4340fafa80aacf424ed81de8a66;hp=8d3925a08220df59199bc2e645979de014df13c8;hpb=6a509099343ed155525c4304f1ad742cc6e4ce59;p=freeside.git

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 8d3925a08..5935da9cd 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -132,13 +132,13 @@ set_display_recurring(<% encode_json({'display_recurring' => [ $cust_main->displ
     </TR>
 % }
 
-% if ( $conf->config('tax_data_vendor') eq 'cch' ) {
+% if ( $conf->config('tax_data_vendor') ) {
 <TR>
   <TH ALIGN="right"><% mt('Tax location') |h %></TH>
 % my $tax_location = $conf->exists('tax-ship_address')
 %                    ? $cust_main->ship_location
 %                    : $cust_main->bill_location;
-  <TD><% $tax_location->geocode('cch') %></TD>
+  <TD><% $tax_location && $tax_location->geocode %></TD>
 </TR>
 % }
 <TR>
@@ -200,13 +200,6 @@ set_display_recurring(<% encode_json({'display_recurring' => [ $cust_main->displ
   </TD>
 </TR>
 
-% if ( $conf->exists('voip-cust_cdr_spools') ) { 
-  <TR>
-    <TH ALIGN="right"><% mt('Spool CDRs') |h %></TH>
-    <TD><% $cust_main->spool_cdr ? $yes : $no %></TD>
-  </TR>
-% } 
-
 % if ( $conf->exists('voip-cust_cdr_squelch') ) { 
   <TR>
     <TH ALIGN="right"><% mt($conf->exists('voip-cdr_email') ? 'Print CDRs' : 'Show CDRs') |h %></TH>