X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fgeocode_Mixin.pm;h=c153914f0ee072b122c1969f9eda767636c07e9b;hb=bc63f0e47edf83207dc857f7f5da05193e1543e8;hp=cf45a92ee4820e15deb3774666b2d2af3a0eb464;hpb=eec4949e2c8f09a0b89331437186b77c4db6ff38;p=freeside.git diff --git a/FS/FS/geocode_Mixin.pm b/FS/FS/geocode_Mixin.pm index cf45a92ee..c153914f0 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_' : '';