summaryrefslogtreecommitdiff
path: root/FS/FS
diff options
context:
space:
mode:
Diffstat (limited to 'FS/FS')
-rw-r--r--FS/FS/Upgrade.pm7
-rw-r--r--FS/FS/cust_main/Location.pm3
2 files changed, 9 insertions, 1 deletions
diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 3f76f5116..45cba82a4 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -84,6 +84,13 @@ sub upgrade_config {
}
}
+ # if there's a USPS tools login, assume that's the standardization method
+ # you want to use
+ if ( length($conf->config('usps_webtools-userid')) > 0 and
+ !$conf->exists('address_standardize_method') ) {
+ $conf->set('address_standardize_method', 'usps');
+ }
+
}
sub upgrade_overlimit_groups {
diff --git a/FS/FS/cust_main/Location.pm b/FS/FS/cust_main/Location.pm
index 8e30bb65b..ba3513b2f 100644
--- a/FS/FS/cust_main/Location.pm
+++ b/FS/FS/cust_main/Location.pm
@@ -18,7 +18,8 @@ BEGIN {
no strict 'refs';
@location_fields =
qw( address1 address2 city county state zip country district
- latitude longitude coord_auto censustract censusyear geocode );
+ latitude longitude coord_auto censustract censusyear geocode
+ addr_clean );
foreach my $f (@location_fields) {
*{"FS::cust_main::Location::$f"} = sub {