2 files changed, 9 insertions, 6 deletions
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 25932019e..ee8d1b18d 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -107,12 +107,14 @@ function samechanged(what) {
   }
 }
 
-% if ( ! $has_ship_address ) {
-  $('#ship_location').hide();
-% }
-
 $().ready( function() {
-  window.bill_location = new Location($('fieldset#bill_location'));
+  window.bill_location = new Location($('fieldset#bill_location'), 'bill_');
+  window.ship_location = new Location($('fieldset#ship_location'), 'ship_');
+
+  if ($('#same').prop('checked')) {
+    $('#ship_location').hide();
+  }
+
 });
 
 </SCRIPT>
diff --git a/httemplate/edit/cust_main/bottomfixup.js b/httemplate/edit/cust_main/bottomfixup.js
index 97816aad7..48da4e32f 100644
--- a/httemplate/edit/cust_main/bottomfixup.js
+++ b/httemplate/edit/cust_main/bottomfixup.js
@@ -5,7 +5,8 @@ my $conf = new FS::Conf;
 my $company_latitude  = $conf->config('company_latitude');
 my $company_longitude = $conf->config('company_longitude');
 
-my @fixups = ('standardize_locations');
+my @fixups = ();
+# 'standardize_locations');
 
 push @fixups, 'confirm_censustract_bill', 'confirm_censustract_ship'
     if $conf->exists('cust_main-require_censustract');