From: ivan <ivan>
Date: Sun, 20 Mar 2011 22:33:13 +0000 (+0000)
Subject: qualification address handling changes, RT#7111
X-Git-Tag: freeside_2_3_0~480
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=16b02c599a64ecc0414343b4fbc0fe5b02543279;p=freeside.git

qualification address handling changes, RT#7111
---

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index b882c3d46..a9c9382f4 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -305,9 +305,10 @@ push @cust_location, $cust_location
 
 @cust_location = sort $location_sort grep !$_->disabled, @cust_location;
 
-if ( ( $prospect_main || $opt{'disable_empty'} ) && !$opt{'is_optional'} ) {
-  $cust_location = $cust_location[0];
-}
+$cust_location = $cust_location[0];
+  if ( $prospect_main || $opt{'disable_empty'} )
+  && !$opt{'is_optional'}
+  && @cust_location;
 
 my $disabled =
   ( $locationnum < 0