[freeside-commits] freeside/FS/FS geocode_Mixin.pm,1.1,1.2

[Ivan,,,]

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

Modified Files:
	geocode_Mixin.pm 
Log Message:
fix tax-ship_address config w/geocode and thus cch, RT#10376

Index: geocode_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/geocode_Mixin.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- geocode_Mixin.pm	11 Oct 2010 19:00:32 -0000	1.1
+++ geocode_Mixin.pm	31 Oct 2010 01:07:52 -0000	1.2
@@ -5,6 +5,7 @@
 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 @@
   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 @@
   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_'
    : '';