X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Felements%2Flocation.html;h=3c8e973ed021b13af9d91621554a1c23b270bf07;hb=3fc0a546caf38b444b63744726c5080ce5d9bbbb;hp=90f20265aca18c38427e1297993197141f53e4b0;hpb=c6ab4d567c978cbe616c8cb5201c61bde212b3a0;p=freeside.git
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 90f20265a..3c8e973ed 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -169,15 +169,14 @@ Example:
-% if ($conf->exists('city_not_required')) {
-
-%} else {
- <<%$th%> ALIGN="right"><%$r%><% mt('City') |h %><%$th%>>
+ <<%$th%> ALIGN="right">
+% unless ($conf->exists('cust_main-no_city_in_address')) {
+ <% $r %><% mt('City') |h %>
+% }
+ <%$th%>>
<% include('/elements/city.html', %select_hash, 'text_style' => \@style ) %> |
-
<<%$th%> ALIGN="right" WIDTH="1" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County<%$th%>>
<% include('/elements/select-county.html', %select_hash ) %> |
-% }
<<%$th%> ALIGN="right" WIDTH="1"><%$r%><% mt('State') |h %><%$th%>>
<% include('/elements/select-state.html', %select_hash ) %>
@@ -246,13 +245,13 @@ Example:
% }
% if ( $opt{enable_district} and $conf->config('tax_district_method') ) {
|
- Tax district |
+ Tax district |
- <% '(automatic)' %>
+ <% '(automatic)' %>
|
% } else {
@@ -291,7 +290,7 @@ Example:
var clear_coords_on_change = [
'<%$pre%>address1',
'<%$pre%>address2',
- '<%$pre%>city',
+ <% $conf->exists('cust_main-no_city_in_address') ? '' : qq('${pre}city',) %>
'<%$pre%>state',
'<%$pre%>zip',
'<%$pre%>country'