[freeside-commits] freeside/FS/FS geocode_Mixin.pm,1.5,1.6

[Ivan,,,]

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

Modified Files:
	geocode_Mixin.pm 
Log Message:
qualification address handling changes, RT#7111

Index: geocode_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/geocode_Mixin.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- geocode_Mixin.pm	13 Mar 2011 18:56:03 -0000	1.5
+++ geocode_Mixin.pm	13 Mar 2011 19:38:02 -0000	1.6
@@ -96,6 +96,7 @@
     $notfirst++;
   }
 
+  if ( $self->get($prefix.'location_type') ) {
   my %location_type;
   if ( 1 ) { #ikano, switch on via config
     { no warnings 'void';
@@ -107,8 +108,11 @@
     %location_type = (); #?
   }
 
-  $line .= ' '. &$escape( $location_type{ $self->get($prefix.'location_type') })
-    if $self->get($prefix.'location_type');
+    $line .= ' '.&$escape( $location_type{ $self->get($prefix.'location_type') }
+                                       ||  $self->get($prefix.'location_type')
+                         );
+  }
+
   $line .= ' '. &$escape($self->get($prefix.'location_number'))
     if $self->get($prefix.'location_number');