X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main_county.pm;h=e44f919f251198667348d182164351bd1da907a0;hb=94bbd4b650023999262c843bca84affd71a5147d;hp=7344e9c830cc883ff12f1d135ad542b7e3034155;hpb=2d40f813c0153cfa2840eb7e218760623d88f55d;p=freeside.git

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index 7344e9c83..e44f919f2 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -196,7 +196,7 @@ 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( $dstate = $state ) =~ s/\n//g;
+      ( my $dstate = $state ) =~ s/[\n\r]//g;
       my $text = $dstate || '(n/a)';
       $script_html .= qq!opt(what.form.${prefix}state, "$dstate", "$text");\n!;
     }