projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
show a warning when the OS goes EOL
[freeside.git]
/
httemplate
/
elements
/
city.html
diff --git
a/httemplate/elements/city.html
b/httemplate/elements/city.html
index
05250fe
..
f710d04
100644
(file)
--- a/
httemplate/elements/city.html
+++ b/
httemplate/elements/city.html
@@
-131,6
+131,10
@@
function <% $pre %>county_changed(what, callback) {}
<% $select_style %>
>
<% $select_style %>
>
+% if ( $opt{city} ) {
+ <OPTION VALUE="<% $opt{city} %>" SELECTED><% $opt{city} %></OPTION>
+% }
+
% unless ( $opt{'disable_empty'} ) {
<OPTION VALUE="" <% $opt{city} eq '' ? 'SELECTED' : '' %>><% $opt{empty_label} %></OPTION>
% }
% unless ( $opt{'disable_empty'} ) {
<OPTION VALUE="" <% $opt{city} eq '' ? 'SELECTED' : '' %>><% $opt{empty_label} %></OPTION>
% }
@@
-153,9
+157,7
@@
my %opt = @_;
my $pre = $opt{'prefix'};
my $conf = new FS::Conf;
my $pre = $opt{'prefix'};
my $conf = new FS::Conf;
-# Using tax_district_method implies that there's not a preloaded city/county
-# tax district table.
-my $disable_select = 1 if $conf->config('tax_district_method');
+my $disable_select = 0;
$opt{'disable_empty'} = 1 unless exists($opt{'disable_empty'});
$opt{'disable_empty'} = 1 unless exists($opt{'disable_empty'});