X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=eb2587b3492e319a5d1f969bef0a3fffa0ff3222;hp=59167a7e480978e6a50c18d7a92beff57eb40c8a;hb=f4ee374e9bbb313234278c7231c046f8e07086f0;hpb=3bfdeb08960dd59c5ad3d202aa8d8c4df10a8a3d

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 59167a7e4..eb2587b34 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -165,6 +165,11 @@ If you need to continue using the old Form 477 report, turn on the
     $conf->delete('voip-cust_email_csv_cdr') ;
   }
 
+  if ($conf->exists('unsuspendauto') && !$conf->config('unsuspend_balance')) {
+    $conf->set('unsuspend_balance','Zero');
+    $conf->delete('unsuspendauto');
+  }
+
   enable_banned_pay_pad() unless length($conf->config('banned_pay-pad'));
 
 }
@@ -198,8 +203,9 @@ sub upgrade_overlimit_groups {
 sub upgrade_invoice_from {
   my ($conf, $agentnum, $agentonly) = @_;
   if (
-      (!$conf->exists('invoice_from_name',$agentnum,$agentonly)) && 
-      ($conf->config('invoice_from',$agentnum,$agentonly) =~ /\<(.*)\>/)
+          ! $conf->exists('invoice_from_name',$agentnum,$agentonly)
+       && $conf->exists('invoice_from',$agentnum,$agentonly)
+       && $conf->config('invoice_from',$agentnum,$agentonly) =~ /\<(.*)\>/
   ) {
     my $realemail = $1;
     $realemail =~ s/^\s*//; # remove leading spaces
@@ -452,6 +458,9 @@ sub upgrade_data {
 
     #populate tax statuses
     'tax_status' => [],
+
+    #mark certain taxes as system-maintained
+    'cust_main_county' => [],
   ;
 
   \%hash;