X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=df5106cb0b7f4de6cf5aaf7d0a5476baacd4a398;hb=4771c3a939c45be1cc2814a5d4c2696cb55212f0;hp=b142aa6904a546b7942a67cf96954440df637287;hpb=6c063e24b90cd374623e2841045fe4c61bed8143;p=freeside.git diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html index b142aa690..df5106cb0 100644 --- a/httemplate/elements/location.html +++ b/httemplate/elements/location.html @@ -219,8 +219,7 @@ Example: % } -% if ( $conf->config('tax_district_method') ) { -% if ( $opt{enable_district} ) { +% if ( $opt{enable_district} and $conf->config('tax_district_method') ) { Tax district @@ -231,21 +230,56 @@ Example: <% '(automatic)' %> -% } else { +% } else { -% } % } %# For address standardization: %# keep a clean copy of the address so we know if we need %# to re-standardize % foreach (qw(address1 city state country zip latitude -% longitude censustract addr_clean) ) { +% longitude censustract district addr_clean) ) { % } %# Placeholders + + + <%init> my %opt = @_;