X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=8452086888add09e33a961f4c183359ab6f65fa8;hb=e71dd08fc2e0aa3ee8cdbeb4e1f39f04898f773b;hp=3faf47e247e0e0958e9353e63541ebbb413140e9;hpb=5f563d5ac7e6e1e93cca382baa42ee106f3db5a0;p=freeside.git

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 3faf47e24..845208688 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -178,6 +178,14 @@ If you need to continue using the old Form 477 report, turn on the
     $conf->set('cust-fields',$cust_fields);
   }
 
+  #repurposed
+  $conf->set('note-classes','Enabled')
+    if $conf->exists('note-classes')
+      and grep {$_ eq $conf->config('note-classes')} ('1','2');
+  $conf->set('note-classes','')
+    if $conf->exists('note-classes')
+      and '0' eq $conf->config('note-classes');
+
   enable_banned_pay_pad() unless length($conf->config('banned_pay-pad'));
 
   # if translate-auto-insert is enabled for a locale, ensure that invoice
@@ -355,6 +363,9 @@ sub upgrade_data {
     #remap log levels
 	'log' => [],
 
+    #fix whitespace - before cust_main
+    'cust_location' => [],
+
     #cust_main (remove paycvv from history, locations, cust_payby, etc)
     'cust_main' => [],
 
@@ -377,6 +388,7 @@ sub upgrade_data {
     # reason / void_reason migration to reasonnum / void_reasonnum
     'cust_credit_void' => [],
     'cust_bill_void' => [],
+    # also fix some tax allocation records
     'cust_bill_pkg_void' => [],
 
     #duplicate history records
@@ -484,9 +496,6 @@ sub upgrade_data {
     #mark certain taxes as system-maintained,
     # and fix whitespace
     'cust_main_county' => [],
-
-    #fix whitespace
-    'cust_location' => [],
   ;
 
   \%hash;