Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / FS / FS / cust_main / Location.pm

diff --git a/FS/FS/cust_main/Location.pm b/FS/FS/cust_main/Location.pm
index 32590bb..be375dd 100644 (file)
--- a/FS/FS/cust_main/Location.pm
+++ b/FS/FS/cust_main/Location.pm
@@ -17,10 +17,12 @@ BEGIN {
   # set up accessors for location fields
   if (!$init) {
     no strict 'refs';
-    @location_fields = 
-      qw( address1 address2 city county state zip country district
-        latitude longitude coord_auto censustract censusyear geocode
-        addr_clean );
+    @location_fields = qw(
+      locationname
+      address1 address2 city county state zip country
+      district latitude longitude coord_auto censustract censusyear geocode
+      addr_clean
+    );
 
     foreach my $f (@location_fields) {
       *{"FS::cust_main::Location::$f"} = sub {
@@ -220,7 +222,9 @@ sub process_upgrade_location {
   my $class = shift;
 
   my $dbh = dbh;
+  local $FS::cust_main::import = 1;
   local $FS::cust_location::import = 1;
+  local $FS::contact::skip_fuzzyfiles = 1;
   local $FS::UID::AutoCommit = 0;
 
   my $tax_prefix = 'bill_';