From: ivan <ivan>
Date: Fri, 23 Jan 2004 03:01:22 +0000 (+0000)
Subject: and the same for ship_
X-Git-Tag: NET_WHOIS_RAW_0_31~172
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=24eb823f02d7681b052261dd321b3505ac970e61

and the same for ship_
---

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index bfe4a2d4f..857e769a3 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -291,8 +291,9 @@ END
   #false laziness with regular state
   $cust_main->ship_country( $countrydefault ) unless $cust_main->ship_country;
 
-  $cust_main->ship_state( $conf->config('statedefault') || 'CA' )
-    unless $cust_main->ship_state || $cust_main->ship_country ne 'US';
+  $cust_main->ship_state( $statedefault )
+    unless $cust_main->ship_state
+           || $cust_main->ship_country ne $countrydefault;
 
   my($ship_county_html, $ship_state_html, $ship_country_html) =
     FS::cust_main_county::regionselector( $cust_main->ship_county,