X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=b50509aeaef22236a1ea3a4aeb84b8ca63a11bfb;hb=a3fc8a9a062757f2c288a36eece7367e8f653e5f;hp=5cdc424a74d87cbb88605e507970a2eae84284dd;hpb=f1e9e0cd3fb22e3e615142889f5f3df799841cc2;p=freeside.git
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 5cdc424a7..b50509aea 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -59,12 +59,7 @@ Example:
% } else {
-
-
+ <& hidden.html, field => $pre.'locationname', value => $object->get('locationname') &>
% }
@@ -102,10 +97,7 @@ Example:
% } else { # alternate format
-
+<& hidden.html, field => $pre.'address2', value => $object->get('address2') &>
<<%$th%> ALIGN="right">Unit type and #<%$th%>>
@@ -177,7 +169,11 @@ Example:
- <<%$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 ) %>
@@ -227,14 +223,14 @@ Example:
% } else {
% foreach (qw(latitude longitude)) {
-
+<& hidden.html, field => $pre.$_, value => $object->get($_) &>
% }
% }
-
-
-
-
-
+%
+% foreach (qw(coord_auto geocode censustract censusyear)) {
+ <& hidden.html, field => $pre.$_, value => $object->get($_) &>
+% }
+%
% if ( $opt{enable_censustract} ) {
Census tract
@@ -259,7 +255,7 @@ Example:
% } else {
-
+ <& hidden.html, field => $pre.'district', value => $object->get('district') &>
% }
%# For address standardization:
@@ -267,11 +263,11 @@ Example:
%# to re-standardize
% foreach (qw(address1 city state country zip latitude
% longitude censustract district addr_clean) ) {
-
+<& hidden.html, field => 'old_'.$pre.$_, value => $object->get($_) &>
% }
%# Placeholders
-
-
+<& hidden.html, field => $pre.'cachenum', value => '' &>
+<& hidden.html, field => $pre.'addr_clean', value => '' &>