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

diff --git a/FS/FS/Misc/Geo.pm b/FS/FS/Misc/Geo.pm
index 71098eb..53efb36 100644 (file)
--- a/FS/FS/Misc/Geo.pm
+++ b/FS/FS/Misc/Geo.pm
@@ -393,7 +393,7 @@ sub standardize_ezlocate {
     latitude    => $match->{MAT_LAT},
     longitude   => $match->{MAT_LON},
     censustract => $match->{FIPS_ST}.$match->{FIPS_CTY}.
-                   sprintf('%04.2f',$match->{CEN_TRCT}),
+                   sprintf('%07.2f',$match->{CEN_TRCT}),
     addr_clean  => 'Y',
   };
 }

diff --git a/httemplate/edit/cust_main/bottomfixup.js b/httemplate/edit/cust_main/bottomfixup.js
index 0de6d9d..9e18fa0 100644 (file)
--- a/httemplate/edit/cust_main/bottomfixup.js
+++ b/httemplate/edit/cust_main/bottomfixup.js
@@ -10,8 +10,9 @@ my @fixups = ('copy_payby_fields', 'standardize_locations');
 push @fixups, 'confirm_censustract'
     if $conf->exists('cust_main-require_censustract');
 
-push @fixups, 'check_unique'
-    if $conf->exists('cust_main-check_unique') and !$opt{'custnum'};
+# currently doesn't work; disable to avoid problems
+#push @fixups, 'check_unique'
+#    if $conf->exists('cust_main-check_unique') and !$opt{'custnum'};
 
 push @fixups, 'do_submit'; # always last
 </%init>