X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Felements%2Fcity.html;h=3c5e91782059b1c450aaf2ba405c518ef90f95f4;hb=b7d4aaee22ceda078bbfcca47038eb0bf4230a1c;hp=5f4d4e09ee587e194d2eebf96f00f3f7f1b0ac5e;hpb=ceeaad3d99869f159bf2fee490aafa4c95d03365;p=freeside.git
diff --git a/httemplate/elements/city.html b/httemplate/elements/city.html
index 5f4d4e09e..3c5e91782 100644
--- a/httemplate/elements/city.html
+++ b/httemplate/elements/city.html
@@ -132,14 +132,14 @@ function <% $pre %>county_changed(what, callback) {}
>
% unless ( $opt{'disable_empty'} ) {
-
% }
% foreach my $city ( @cities ) {
% }
@@ -153,12 +153,15 @@ my %opt = @_;
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'});
+if ($conf->exists('cust_main-no_city_in_address')) {
+ $opt{'disable_text'} = 1;
+ $disable_select = 1;
+}
+
my $text_style = $opt{'style'} ? [ @{ $opt{'style'} } ] : [];
my $select_style = $opt{'style'} ? [ @{ $opt{'style'} } ] : [];