[freeside-commits] freeside/FS/FS cust_main.pm,1.599,1.600

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv4383

Modified Files:
	cust_main.pm 
Log Message:
prevent automatic geocoding when upgrading an old db, RT#15539

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.599
retrieving revision 1.600
diff -u -w -d -r1.599 -r1.600
--- cust_main.pm	30 Dec 2011 22:10:57 -0000	1.599
+++ cust_main.pm	1 Jan 2012 02:58:38 -0000	1.600
@@ -1499,12 +1499,14 @@
 
   }
 
+  unless ( $import ) {
   $self->set_coord
     if ! $self->coord_auto && ! $self->latitude && ! $self->longitude;
 
   $self->set_coord('ship_')
     if $self->has_ship_address && ! $self->ship_coord_auto
     && ! $self->ship_latitude && ! $self->ship_longitude;
+  }
 
   local($ignore_expired_card) = 1
     if $old->payby  =~ /^(CARD|DCRD)$/
@@ -5034,6 +5036,7 @@
   local($ignore_illegal_zip) = 1;
   local($ignore_banned_card) = 1;
   local($skip_fuzzyfiles) = 1;
+  local($import) = 1; #prevent automatic geocoding (need its own variable?)
   $class->_upgrade_otaker(%opts);
 
 }