X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fcity.html;h=05250fef559600500930bcc06d42f8e11c6bd69e;hb=ded6a5654efd56d2f271970c992133600e0223b1;hp=5f4d4e09ee587e194d2eebf96f00f3f7f1b0ac5e;hpb=ceeaad3d99869f159bf2fee490aafa4c95d03365;p=freeside.git
diff --git a/httemplate/elements/city.html b/httemplate/elements/city.html
index 5f4d4e09e..05250fef5 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 ) {
% }
@@ -159,6 +159,11 @@ my $disable_select = 1 if $conf->config('tax_district_method');
$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'} } ] : [];