X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=bfb218f3310f3af3a9f75e0eec3c6f1874b3f4c2;hb=229373d8ab3b19351e14f345eb42344b8ed72d35;hp=395c6d0b38b57aa69dd16894e29c6dce46d6a6a8;hpb=7643e364c22eeca302f09a87ea968175ce01985b;p=freeside.git

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 395c6d0b3..bfb218f33 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -160,6 +160,22 @@ If you need to continue using the old Form 477 report, turn on the
     $conf->delete('batch-errors_to');
   }
 
+  if ( $conf->exists('voip-cust_email_csv_cdr') ) {
+    $conf->set('voip_cdr_email_attach', 'csv');
+    $conf->delete('voip-cust_email_csv_cdr') ;
+  }
+
+  if ( !$conf->config('password-generated-characters') ) {
+    my $pw_set = 
+      'abcdefghijkmnpqrstuvwxyzABCDEFGHIJKLMNPQRSTUVWXYZ23456789()#.,' ;
+    $conf->set('password-generated-characters', $pw_set);
+  }
+
+  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'));
 
 }
@@ -325,12 +341,6 @@ sub upgrade_data {
 
   tie my %hash, 'Tie::IxHash', 
 
-    #payby conditions to new ones
-    'part_event_condition' => [],
-
-    #payby actions to new ones
-    'part_event' => [],
-
     #cust_main (remove paycvv from history, locations, cust_payby, etc)
     'cust_main' => [],
 
@@ -453,6 +463,9 @@ sub upgrade_data {
 
     #populate tax statuses
     'tax_status' => [],
+
+    #mark certain taxes as system-maintained
+    'cust_main_county' => [],
   ;
 
   \%hash;