X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main%2Fbilling.html;h=618e1913a95bfc7dbfc4fabaa799a9b29f2adcb6;hb=2009d9cee8038aeff5b4313113fc23f546455cf5;hp=649c4c9453f9edacf028b0bf6ef9d51c2b7af300;hpb=6eec422e339e7a7209cac18da71ba598ee18d7d2;p=freeside.git

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 649c4c945..618e1913a 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -105,6 +105,16 @@
       box_first   => 1,
     &>
 
+% if ( $conf->config_bool('allow_payment_receipt_noemail', $cust_main->agentnum) ) {
+    <& /elements/tr-checkbox.html,
+      field       => 'paymentreceipt_noemail',
+      label       => emt('Do not send email payment receipts'),
+      value       => 'Y',
+      curr_value  => $cust_main->paymentreceipt_noemail,
+      box_first   => 1,
+    &>
+% }
+
     <& /elements/tr-checkbox.html,
       field       => 'message_noemail',
       label       => emt('Do not send other email notices'),
@@ -179,10 +189,27 @@
     <TR>
       <TH ALIGN="right" WIDTH="200"><% mt('Invoice terms') |h %> </TD>
       <TD WIDTH="408">
-        <& /elements/select-terms.html,
-             'curr_value' => $cust_main->invoice_terms,
-             'agentnum'   => $cust_main->agentnum,
-        &>
+%       if ( $curuser->access_right('Edit customer invoice terms') ) {
+          <& /elements/select-terms.html,
+               'curr_value' => $cust_main->invoice_terms,
+               'agentnum'   => $cust_main->agentnum,
+          &>
+%       } else {
+%
+%         my $terms =
+%           $cust_main->invoice_terms
+%             || emt('Default').' ('.
+%                ( $conf->config('invoice_default_terms', $cust_main->agentnum)
+%                    || emt('Payable upon receipt')
+%                ).
+%                ')';
+          <% $terms |h %>
+
+          <& /elements/hidden.html, 
+               'field'      => 'invoice_terms',
+               'curr_value' => $cust_main->invoice_terms,
+          &>
+%       }
       </TD>
     </TR>
 
@@ -224,14 +251,6 @@ function toggle(obj) {
 %   # CDR flags / options
 %   ###
 
-% if ( $conf->exists('voip-cust_cdr_spools') ) { 
-      <TR>
-       <TD COLSPAN="2"><INPUT TYPE="checkbox" NAME="spool_cdr" VALUE="Y" <% $cust_main->spool_cdr eq "Y" ? 'CHECKED' : '' %>> <% mt('Spool CDRs') |h %></TD>
-      </TR>
-% } else { 
-      <INPUT TYPE="hidden" NAME="spool_cdr" VALUE="<% $cust_main->spool_cdr %>">
-% }
-
 % if ( $conf->exists('voip-cust_cdr_squelch') ) { 
       <TR>
        <TD COLSPAN="2"><INPUT TYPE="checkbox" NAME="squelch_cdr" VALUE="Y" <% $cust_main->squelch_cdr eq "Y" ? 'CHECKED' : '' %>> <% mt($conf->exists('voip-cdr_email') ? 'Omit CDRs from printed invoices' : 'Omit CDRs from invoices') |h %></TD>