X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=8e6a1f1325f8748aa1b28357a87b733fa2266906;hb=368ed08e24400e9d1faf401a1e4e23ea54d2c969;hp=c15f7ddaaeb26356110bc250726122e6155ee548;hpb=2082afa31ef1e98cf2afbc7d8365935f92cc61d0;p=freeside.git

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index c15f7ddaa..8e6a1f132 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -153,7 +153,7 @@ If you need to continue using the old Form 477 report, turn on the
 
   # boolean+text previous_balance-exclude_from_total is now two separate options
   my $total_new_charges = $conf->config('previous_balance-exclude_from_total');
-  if (length($total_new_charges) > 0) {
+  if ( defined $total_new_charges && length($total_new_charges) > 0 ) {
     $conf->set('previous_balance-text-total_new_charges', $total_new_charges);
     $conf->set('previous_balance-exclude_from_total', '');
   }
@@ -174,8 +174,8 @@ If you need to continue using the old Form 477 report, turn on the
     $conf->delete('unsuspendauto');
   }
 
-  if ($conf->config('cust-fields') =~ / \| Payment Type/) {
-    my $cust_fields = $conf->config('cust-fields');
+  my $cust_fields = $conf->config('cust-fields');
+  if ( defined $cust_fields && $cust_fields =~ / \| Payment Type/ ) {
     # so we can potentially use 'Payment Types' or somesuch in the future
     $cust_fields =~ s/ \| Payment Type( \|)/$1/;
     $cust_fields =~ s/ \| Payment Type$//;
@@ -373,7 +373,7 @@ sub upgrade_data {
   tie my %hash, 'Tie::IxHash', 
 
     #remap log levels
-	'log' => [],
+    'log' => [],
 
     #fix whitespace - before cust_main
     'cust_location' => [],
@@ -382,6 +382,9 @@ sub upgrade_data {
     # blocks tokenization upgrade if deprecated features still in use
     'agent_payment_gateway' => [],
 
+    #remove bad source_paynum before cust_main
+    'cust_refund' => [],
+
     #cust_main (tokenizes cards, remove paycvv from history, locations, cust_payby, etc)
     # (handles payinfo encryption/tokenization across all relevant tables)
     'cust_main' => [],
@@ -451,7 +454,7 @@ sub upgrade_data {
     'cust_pkg' => [],
     #'cust_pkg_reason' => [],
     'cust_pkg_discount' => [],
-    'cust_refund' => [],
+    #'cust_refund' => [],
     'banned_pay' => [],
 
     #paycardtype