don't reenable postal billing for existing customers just cause its blank...

[freeside.git] / httemplate / edit / cust_main / billing.html

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 1f557c8..96f777b 100644 (file)
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -1,6 +1,7 @@
 <%
 
-my( $cust_main ) = @_;
+my( $cust_main, %options ) = @_;
+my @invoicing_list = @{ $options{'invoicing_list'} };
 my $conf = new FS::Conf;
 my $payby_default = $conf->config('payby-default');
 
@@ -49,14 +50,12 @@ if ( $payby_default eq 'HIDE' ) {
 
   <INPUT TYPE="hidden" NAME="tax" VALUE="<%= $cust_main->tax %>">
 
-  <INPUT TYPE="hidden" NAME="invoicing_list" VALUE="<%= join(', ', $cust_main->invoicing_list) %>">
+  <INPUT TYPE="hidden" NAME="invoicing_list" VALUE="<%= join(', ', @invoicing_list) %>">
 
   </FORM>
 
 <% } else {
 
-  my @invoicing_list = $cust_main->invoicing_list;
-
   my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
 %>
@@ -403,7 +402,10 @@ if ( $payby_default eq 'HIDE' ) {
     <TR>
       <TD WIDTH="608" COLSPAN="2"><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST" <%=
 
-        ( ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
+        ( (    ! @invoicing_list
+            && ! $conf->exists('disablepostalinvoicedefault')
+            && ! $cust_main->custnum
+          )
           || grep { $_ eq 'POST' } @invoicing_list                     )
 
           ? 'CHECKED'