projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d5109b4
)
prevent automatic geocoding when upgrading an old db, RT#15539
author
ivan
<ivan>
Sun, 1 Jan 2012 02:57:55 +0000
(
02:57
+0000)
committer
ivan
<ivan>
Sun, 1 Jan 2012 02:57:55 +0000
(
02:57
+0000)
FS/FS/cust_main.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_main.pm
b/FS/FS/cust_main.pm
index
73734df
..
7937a00
100644
(file)
--- a/
FS/FS/cust_main.pm
+++ b/
FS/FS/cust_main.pm
@@
-1499,12
+1499,14
@@
sub replace {
}
}
- $self->set_coord
- if ! $self->coord_auto && ! $self->latitude && ! $self->longitude;
+ 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;
+ $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)$/
local($ignore_expired_card) = 1
if $old->payby =~ /^(CARD|DCRD)$/
@@
-4984,6
+4986,7
@@
sub _upgrade_data { #class method
local($ignore_illegal_zip) = 1;
local($ignore_banned_card) = 1;
local($skip_fuzzyfiles) = 1;
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);
}
$class->_upgrade_otaker(%opts);
}