X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2Fcust_main_county.pm;h=17f346071963e45bd42d2dda4760584f0da5f546;hb=d201bed3c90f0a8b80541c3216c265405117694d;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..17f346071 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";
}
@@ -250,7 +251,7 @@ END
foreach my $state ( sort keys %{ $cust_main_county{$selected_country} } ) {
my $text = $state || '(n/a)';
my $selected = $state eq $selected_state ? 'SELECTED' : '';
- $state_html .= "\n"
+ $state_html .= qq(\n);
}
$state_html .= '';
@@ -264,7 +265,7 @@ END
keys %cust_main_county
) {
my $selected = $country eq $selected_country ? ' SELECTED' : '';
- $country_html .= "\n"
+ $country_html .= qq(\n");
}
$country_html .= '';