summaryrefslogtreecommitdiff
path: root/FS/FS/geocode_Mixin.pm
diff options
context:
space:
mode:
authorivan <ivan>2010-10-31 01:07:52 +0000
committerivan <ivan>2010-10-31 01:07:52 +0000
commit52af11086f11adc4228a68047bcfa1552650d1d5 (patch)
treea545d39e883edb826b347fce619b59bcb1bfcce4 /FS/FS/geocode_Mixin.pm
parentcc04f43d238a1aed658d766577e45d96fcb38d77 (diff)
fix tax-ship_address config w/geocode and thus cch, RT#10376
Diffstat (limited to 'FS/FS/geocode_Mixin.pm')
-rw-r--r--FS/FS/geocode_Mixin.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/FS/FS/geocode_Mixin.pm b/FS/FS/geocode_Mixin.pm
index cf45a92..c153914 100644
--- a/FS/FS/geocode_Mixin.pm
+++ b/FS/FS/geocode_Mixin.pm
@@ -5,6 +5,7 @@ use vars qw( $DEBUG $me );
use Carp;
use Locale::Country;
use FS::Record qw( qsearchs qsearch );
+use FS::Conf;
use FS::cust_pkg;
use FS::cust_location;
use FS::cust_tax_location;
@@ -82,7 +83,7 @@ sub location_label {
my $ds = $opt{double_space} || ' ';
my $line = '';
my $cydefault =
- $opt{'countrydefault'} || FS::conf->new->config('countrydefault') || 'US';
+ $opt{'countrydefault'} || FS::Conf->new->config('countrydefault') || 'US';
my $prefix = $self->has_ship_address ? 'ship_' : '';
my $notfirst = 0;
@@ -122,7 +123,7 @@ sub geocode {
return $geocode if $geocode;
my $prefix =
- ( FS::conf->new->exists('tax-ship_address') && $self->has_ship_address )
+ ( FS::Conf->new->exists('tax-ship_address') && $self->has_ship_address )
? 'ship_'
: '';