From 8f8283f365995ff83040ee6b62920dd0149c1eac Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Tue, 28 May 2013 17:18:46 -0700
Subject: fix some problems with ordering packages on alt. locations, #23189,
 #940

---
 httemplate/elements/location.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'httemplate/elements/location.html')

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:
-- 
cgit v1.2.1