X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main_county.pm;h=e44f919f251198667348d182164351bd1da907a0;hb=d33015393db77e9bc8e0deeb1a39500b3b5a49eb;hp=d96bd41deed2ffcab5a215842d420b805ef4a93b;hpb=e6b0e9237c4bbc31c820b06ece0029f75166506d;p=freeside.git

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index d96bd41de..e44f919f2 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -196,8 +196,9 @@ END
   foreach my $country ( sort keys %cust_main_county ) {
     $script_html .= "\nif ( country == \"$country\" ) {\n";
     foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
-      my $text = $state || '(n/a)';
-      $script_html .= qq!opt(what.form.${prefix}state, "$state", "$text");\n!;
+      ( my $dstate = $state ) =~ s/[\n\r]//g;
+      my $text = $dstate || '(n/a)';
+      $script_html .= qq!opt(what.form.${prefix}state, "$dstate", "$text");\n!;
     }
     $script_html .= "}\n";
   }