per-customer invoice terms override

1 files changed, 14 insertions, 10 deletions

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 1f80dc5bc..b73270c6c 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -1,11 +1,3 @@
-%
-%  my( $cust_main ) = @_;
-%  my @invoicing_list = $cust_main->invoicing_list;
-%  my $conf = new FS::Conf;
-%  my $money_char = $conf->config('money_char') || '$';
-%
-
-
 Billing information
 %  # If we can't see the unencrypted card, then bill now is an exercise in frustration 
 %if ( ! $cust_main->is_encrypted($cust_main->payinfo) ) { 
@@ -179,14 +171,26 @@ Billing information
     <% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || 'no' %>
   </TD>
 </TR>
-% if ( $conf->exists('voip-cust_cdr_spools') ) { 
+<TR>
+  <TD ALIGN="right">Invoice&nbsp;terms</TD>
+  <TD BGCOLOR="#ffffff">
+    <% $cust_main->invoice_terms || 'Default ('. ( $conf->config('invoice_default_terms') || 'Payable upon receipt' ). ')' %>
+  </TD>
+</TR>
 
+% if ( $conf->exists('voip-cust_cdr_spools') ) { 
   <TR>
     <TD ALIGN="right">Spool&nbsp;CDRs</TD>
     <TD BGCOLOR="#ffffff"><% $cust_main->spool_cdr ? 'yes' : 'no' %></TD>
   </TR>
 % } 
 
-
 </TABLE></TD></TR></TABLE>
+<%init>
+
+my( $cust_main ) = @_;
+my @invoicing_list = $cust_main->invoicing_list;
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
 
+</%init>