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

and the same for ship_
---

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 6da52c8f5..5b924201c 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,