X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Ftr-select-cust_location.html;h=5802f4ec217737e569f43f5c0796430306c58091;hb=f4f7bb4086cdaf2699c6d028b76e99b3e9be1e90;hp=78252ba1d2319b51dadda452575f9490390a43d9;hpb=663b89d06a2c97fb0e7915ba409310fbefefea98;p=freeside.git

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index 78252ba1d..5802f4ec2 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -154,14 +154,20 @@ Example:
   <<%$th%> ALIGN="right"><% $opt{'label'} || 'Service&nbsp;location' %></<%$th%>>
   <TD COLSPAN=7>
     <SELECT NAME="locationnum" onChange="locationnum_changed(this);">
+% if ( !$prospect_main ) {
       <OPTION VALUE=""><% $opt{'empty_label'} || '(default service address)' |h %>
+% }
 % if ( $opt{'is_optional'} ) {
     <OPTION VALUE="-2" <% $locationnum == -2 ? 'SELECTED' : ''%>><% $opt{'optional_label'} || '(not required)' |h %>
 % }
 %     my @locations = $cust_main ? $cust_main->cust_location : ();
+%     @locations = qsearch('cust_location', 
+%			    { 'prospectnum' => $prospect_main->prospectnum } ) 
+%	    if $prospect_main;
 %     push @locations, $cust_location
 %       if !$cust_main && $cust_location && $cust_location->locationnum>0;
 %     foreach my $loc ( sort $location_sort @locations ) {
+%       next if $loc->disabled;
         <OPTION VALUE="<% $loc->locationnum %>"
                 <% $locationnum == $loc->locationnum ? 'SELECTED' : '' %>
         ><% $loc->line |h %>