X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=41a67a0cbb9f852e507f7f2590b20bd0cbded0b0;hb=8f8283f365995ff83040ee6b62920dd0149c1eac;hp=68552331414f0b97937070309a8b53f82cccc51c;hpb=54a357b171aa44f9399b4c146acd2afd3b686075;p=freeside.git

diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 685523314..41a67a0cb 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -219,8 +219,7 @@ Example:
   </TD>
 </TR>
 % }
-% if ( $conf->config('tax_district_method') ) {
-%   if ( $opt{enable_district} ) {
+% if ( $opt{enable_district} and $conf->config('tax_district_method') ) {
   <TR>
     <TD ALIGN="right">Tax&nbsp;district</TD>
     <TD COLSPAN=8>
@@ -231,9 +230,8 @@ Example:
     <% '(automatic)' %>
     </TD>
   </TR>
-%   } else {
+% } else {
     <INPUT TYPE="hidden" ID="<%$pre%>" NAME="<%$pre%>district" VALUE="<% $object->district %>">
-%   }
 % }
 
 %# For address standardization: