X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=29ed2c760f31ba2e2809af0609274902a43f237e;hb=0e115ecd7e70269ac58ce705adec4b1c801d14de;hp=49dbeaeba11c219e4b6808df2428da87e3065743;hpb=5b2872a065cd65c823e9056b9153e4548ee7c201;p=freeside.git

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 49dbeaeba..29ed2c760 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -138,7 +138,7 @@ set_display_recurring(<% encode_json({'display_recurring' => [ $cust_main->displ
 % my $tax_location = $conf->exists('tax-ship_address')
 %                    ? $cust_main->ship_location
 %                    : $cust_main->bill_location;
-  <TD><% $tax_location->geocode %></TD>
+  <TD><% $tax_location && $tax_location->geocode %></TD>
 </TR>
 % }
 <TR>
@@ -167,6 +167,12 @@ set_display_recurring(<% encode_json({'display_recurring' => [ $cust_main->displ
   <TD><% $cust_main->invoice_noemail ? $refused : $allowed %></TD>
 % }
 </TR>
+% if ( $conf->config_bool('allow_payment_receipt_noemail', $cust_main->agentnum) ) {
+<TR>
+  <TH ALIGN="right"><% mt('Email payment receipts') |h %></TH>
+  <TD><% $cust_main->paymentreceipt_noemail ? $refused : $allowed %></TD>
+</TR>
+% }
 <TR>
   <TH ALIGN="right"><% mt('Other email notices') |h %></TH>
   <TD>
@@ -200,13 +206,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>