summaryrefslogtreecommitdiff
path: root/httemplate/elements/location.html
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2013-05-28 17:18:17 -0700
committerMark Wells <mark@freeside.biz>2013-05-28 17:18:17 -0700
commitb8144cab2a804b964d1a97164780e2ddc6ae60ec (patch)
tree213c7e2db7bb81f2f6b171f7517deab7badab2b5 /httemplate/elements/location.html
parent8924a9dd6fa3d985a061e8c6e542990173adae34 (diff)
fix some problems with ordering packages on alt. locations, #23189, #940
Diffstat (limited to 'httemplate/elements/location.html')
-rw-r--r--httemplate/elements/location.html6
1 files changed, 2 insertions, 4 deletions
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: