[freeside-commits] freeside/httemplate/view/cust_main billing.html, 1.8, 1.9

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main
In directory wavetail:/tmp/cvs-serv22070/httemplate/view/cust_main

Modified Files:
	billing.html 
Log Message:
per-customer invoice terms override

Index: billing.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/billing.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- billing.html	14 Dec 2006 06:00:46 -0000	1.8
+++ billing.html	5 Apr 2007 02:04:21 -0000	1.9
@@ -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 @@
     <% 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>