[freeside-commits] freeside/httemplate/edit/cust_main contact.html, 1.6.2.3, 1.6.2.4 billing.html, 1.14.2.7, 1.14.2.8

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit/cust_main
In directory wavetail.420.am:/tmp/cvs-serv5906/httemplate/edit/cust_main

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	contact.html billing.html 
Log Message:
fix browse results for selecting counties (resulting from separating tax classes), also add dropdowns to browse by state and county, RT#4496

Index: billing.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_main/billing.html,v
retrieving revision 1.14.2.7
retrieving revision 1.14.2.8
diff -u -d -r1.14.2.7 -r1.14.2.8
--- billing.html	31 Mar 2008 22:27:56 -0000	1.14.2.7
+++ billing.html	28 Dec 2008 18:44:54 -0000	1.14.2.8
@@ -199,11 +199,11 @@
 %      ( $conf->exists('show_bankstate') ?
 %          qq!<TR><TD ALIGN="right" WIDTH="200">$paystate_label</TD>!.
 %          qq!<TD COLSPAN="3" WIDTH="408">!.
-%          include('select-state.html',
+%          include('/elements/select-state.html',
 %                    'empty'   => '(choose)',
 %                    'state'   => $cust_main->paystate,
 %                    'country' => $cust_main->country,
-%                    'prefix' => 'pay',
+%                    'prefix'  => 'pay',
 %                 ). "</TD></TR>"
 %         : '<INPUT TYPE="hidden" NAME="paystate" VALUE ="'.
 %            $cust_main->paystate. '">'

Index: contact.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_main/contact.html,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -d -r1.6.2.3 -r1.6.2.4
--- contact.html	17 Dec 2007 00:59:44 -0000	1.6.2.3
+++ contact.html	28 Dec 2008 18:44:54 -0000	1.6.2.4
@@ -54,11 +54,11 @@
   </TD>
   <TH ALIGN="right" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County</TH>
   <TD>
-    <% include('select-county.html', %select_hash ) %>
+    <% include('/elements/select-county.html', %select_hash ) %>
   </TD>
   <TH ALIGN="right"><%$r%>State</TH>
   <TD>
-    <% include('select-state.html', %select_hash ) %>
+    <% include('/elements/select-state.html', %select_hash ) %>
   </TD>
   <TH><%$r%>Zip</TH>
   <TD>
@@ -68,7 +68,7 @@
 
 <TR>
   <TH ALIGN="right"><%$r%>Country</TH>
-  <TD COLSPAN=5><% include('select-country.html', %select_hash ) %></TD>
+  <TD COLSPAN=5><% include('/elements/select-country.html', %select_hash ) %></TD>
 </TR>
 
 <TR>
@@ -98,13 +98,18 @@
   <TD ALIGN="right"><% $stateid_label %></TD>
   <TD><INPUT TYPE="text" NAME="stateid" VALUE="<% $opt{stateid} %>" SIZE=12 onChange="<% $onchange %>" <% $disabled %>></TD>
   <TD ALIGN="right"><% $stateid_state_label %></TD>
-  <TD><% include('select-state.html', 'state'    => $cust_main->stateid_state,
-                                      'country'  => $cust_main->country,
-                                      'prefix'   => 'stateid_',
-                                      'onchange' => $onchange,
-                                      'disabled' => $disabled) %></TD>
+  <TD><% include('/elements/select-state.html',
+                   'state'    => $cust_main->stateid_state,
+                   'country'  => $cust_main->country,
+                   'prefix'   => 'stateid_',
+                   'onchange' => $onchange,
+                   'disabled' => $disabled
+                )
+      %>
+  </TD>
 </TR>
-% } elsif (!$pre) {
+% } elsif ( !$pre ) {
+
   <TD><INPUT TYPE="hidden" NAME="stateid" VALUE="<% $opt{stateid} %>"></TD>
   <TD><INPUT TYPE="hidden" NAME="stateid_state" VALUE="<% $cust_main->stateid_state %>"></TD>
 % }