X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fgeocode_Mixin.pm;h=08e7b86197a9e6e923cd6c375b10a5dd23216a7d;hb=4ac0d2e3a22e4e49a593aaf683754fea75fce546;hp=cf45a92ee4820e15deb3774666b2d2af3a0eb464;hpb=eec4949e2c8f09a0b89331437186b77c4db6ff38;p=freeside.git

diff --git a/FS/FS/geocode_Mixin.pm b/FS/FS/geocode_Mixin.pm
index cf45a92ee..08e7b8619 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;
@@ -50,7 +51,8 @@ sub location_hash {
   map { my $method = ($_ eq 'geocode') ? $_ : $prefix.$_;
         $_ => $self->get($method);
       }
-      qw( address1 address2 city county state zip country geocode );
+      qw( address1 address2 city county state zip country geocode 
+	location_type location_number location_kind );
 }
 
 =item location_label [ OPTION => VALUE ... ]
@@ -82,11 +84,11 @@ 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;
-  foreach (qw ( address1 address2 ) ) {
+  foreach (qw ( address1 address2 location_type location_number ) ) {
     my $method = "$prefix$_";
     $line .= ($notfirst ? $separator : ''). &$escape($self->$method)
       if $self->$method;
@@ -122,7 +124,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_'
    : '';