From: ivan <ivan>
Date: Sun, 31 Oct 2010 01:07:52 +0000 (+0000)
Subject: fix tax-ship_address config w/geocode and thus cch, RT#10376
X-Git-Tag: TORRUS_1_0_9~175
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=52af11086f11adc4228a68047bcfa1552650d1d5

fix tax-ship_address config w/geocode and thus cch, RT#10376
---

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_'
    : '';