X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=b4340d07511608d46d78a9c938ad16f0cc10e7bc;hb=f39624dd22a91495798f253aa5f122e05a77bc41;hp=6333a834ec13cbc8c9039ecd86251b46bbc9f87c;hpb=c901bfbd9114865ce0c6fd76c6378e534c3616d5;p=freeside.git

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 6333a834e..b4340d075 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -147,6 +147,13 @@ If you need to continue using the old Form 477 report, turn on the
     $conf->delete('tax-cust_exempt-groups-require_individual_nums');
   }
 
+  # 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) {
+    $conf->set('previous_balance-text-total_new_charges', $total_new_charges);
+    $conf->set('previous_balance-exclude_from_total', '');
+  }
+
   enable_banned_pay_pad() unless length($conf->config('banned_pay-pad'));
 
 }
@@ -430,6 +437,9 @@ sub upgrade_data {
     #populate state FIPS codes if not already done
     'state' => [],
 
+    #set default locations on quoted packages
+    'quotation_pkg' => [],
+
     #populate tax statuses
     'tax_status' => [],
   ;