fix "same as billing" oddity

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

diff --git a/httemplate/edit/cust_main/basics.html b/httemplate/edit/cust_main/basics.html
index 91868d4..1c5023d 100644 (file)
--- a/httemplate/edit/cust_main/basics.html
+++ b/httemplate/edit/cust_main/basics.html
@@ -83,7 +83,9 @@
   }
 
   <&| /elements/onload.js &>
-  agent_changed(document.getElementById('agentnum'))
+  rescom_changed(document.getElementById('residential_commercial_Residential'));
+  agent_changed(document.getElementById('agentnum'));
+  samechanged(document.getElementById('same'));
   </&>
  
 </SCRIPT>
@@ -247,6 +249,8 @@ my( $cust_main, %opt ) = @_;
 
 my $custnum = $opt{'custnum'};
 
+my $conf = new FS::Conf;
+
 if ( $cgi->param('error') ) {
   $cust_main->set('residential_commercial',
     ($cgi->param('residential_commercial') eq 'Commercial')
@@ -260,12 +264,13 @@ if ( $cgi->param('error') ) {
       : 'Residential'
   );
 } else { #new customer
-  #config to default to commercial and/or disable residential when someone needs
-  $cust_main->set('residential_commercial', 'Residential');
+  $cust_main->set('residential_commercial',
+    $conf->exists('cust_main-default_commercial')
+      ? 'Commercial'
+      : 'Residential'
+  );
 }
 
-my $conf = new FS::Conf;
-
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 my $r = qq!<font color="#ff0000">*</font>&nbsp;!;