X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=a7fe99f903f092b842d667f497c6f775d3b28dcc;hb=b7c25d5e38e6459efe5d1c2f09f437b79798038e;hp=056b80b4c8ca84e8da73cdb5ac3a6527801821f4;hpb=91dbe4c3834f38d428367d9a1e2c6cf9ea9d84a4;p=freeside.git

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 056b80b4c..a7fe99f90 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -86,10 +86,10 @@ sub upgrade_config {
 
   # if there's a USPS tools login, assume that's the standardization method
   # you want to use
-  if ( length($conf->config('usps_webtools-userid')) > 0 and
-       !$conf->exists('address_standardize_method') ) {
-    $conf->set('address_standardize_method', 'usps');
-  }
+  $conf->set('address_standardize_method', 'usps')
+    if $conf->exists('usps_webtools-userid')
+    && length($conf->config('usps_webtools-userid')) > 0
+    && ! $conf->exists('address_standardize_method');
 
 }
 
@@ -132,6 +132,9 @@ sub upgrade {
   local $FS::UID::AutoCommit = 0;
   local $FS::UID::AutoCommit = 0;
 
+  local $FS::cust_pkg::upgrade = 1; #go away after setup+start dates cleaned up for old customers
+
+
   foreach my $table ( keys %$data ) {
 
     my $class = "FS::$table";