fix regionselector for CR in region names for some reason

[freeside.git] / FS / FS / cust_main_county.pm

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index ef2793a..4ea2199 100644 (file)
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -61,8 +61,6 @@ currently supported:
 
 =item exempt_amount
 
-=item taxname - if defined, printed on invoices instead of "Tax"
-
 =item setuptax - if 'Y', this tax does not apply to setup fees
 
 =item recurtax - if 'Y', this tax does not apply to recurring fees
@@ -119,8 +117,7 @@ sub check {
     || $self->ut_textn('taxname')
     || $self->ut_enum('setuptax', [ '', 'Y' ] )
     || $self->ut_enum('recurtax', [ '', 'Y' ] )
-    || $self->SUPER::check
-    ;
+  ;
 
 }
 
@@ -196,8 +193,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//g;
+      my $text = $dstate || '(n/a)';
+      $script_html .= qq!opt(what.form.${prefix}state, "$dstate", "$text");\n!;
     }
     $script_html .= "}\n";
   }