[freeside-commits] freeside/httemplate/elements popup_link-cust_main.html, 1.6, 1.7 tr-select-cust_location.html, 1.12, 1.13

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail.420.am:/tmp/cvs-serv15820/httemplate/elements

Modified Files:
	popup_link-cust_main.html tr-select-cust_location.html 
Log Message:
Ikano / svc_dsl / qualification improvements, RT7111

Index: tr-select-cust_location.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-select-cust_location.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -d -r1.12 -r1.13
--- tr-select-cust_location.html	14 Dec 2010 07:29:12 -0000	1.12
+++ tr-select-cust_location.html	20 Jan 2011 20:46:29 -0000	1.13
@@ -154,11 +154,16 @@
   <<%$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 ) {

Index: popup_link-cust_main.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/popup_link-cust_main.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- popup_link-cust_main.html	4 Oct 2009 00:07:49 -0000	1.6
+++ popup_link-cust_main.html	20 Jan 2011 20:46:29 -0000	1.7
@@ -39,4 +39,8 @@
   ( $params->{'action'} =~ /\?/ ? ';' : '?' ).
   'custnum='. $params->{'cust_main'}->custnum;
 
+$params->{'action'} .= ';pkgpart='.$params->{'pkgpart'} if $params->{'pkgpart'};
+$params->{'action'} .= ';locationnum='.$params->{'locationnum'} if $params->{'locationnum'};
+$params->{'action'} .= ';svcpart='.$params->{'svcpart'} if $params->{'svcpart'};
+
 </%init>