projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
elements
/
location.html
diff --git
a/httemplate/elements/location.html
b/httemplate/elements/location.html
index
6855233
..
41a67a0
100644
(file)
--- a/
httemplate/elements/location.html
+++ b/
httemplate/elements/location.html
@@
-219,8
+219,7
@@
Example:
</TD>
</TR>
% }
</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 district</TD>
<TD COLSPAN=8>
<TR>
<TD ALIGN="right">Tax district</TD>
<TD COLSPAN=8>
@@
-231,9
+230,8
@@
Example:
<% '(automatic)' %>
</TD>
</TR>
<% '(automatic)' %>
</TD>
</TR>
-%
} else {
+% } else {
<INPUT TYPE="hidden" ID="<%$pre%>" NAME="<%$pre%>district" VALUE="<% $object->district %>">
<INPUT TYPE="hidden" ID="<%$pre%>" NAME="<%$pre%>district" VALUE="<% $object->district %>">
-% }
% }
%# For address standardization:
% }
%# For address standardization: