X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main_county.pm;h=17f346071963e45bd42d2dda4760584f0da5f546;hb=a5a4afbb77bbdffc25ae94d10b645b0bcc76e859;hp=76c982ae8a91b131809833b9af76e290cfa9e48a;hpb=eb9668a6f3181ee02cb335272c5ee4616e61fd09;p=freeside.git
diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index 76c982ae8..17f346071 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -110,7 +110,7 @@ sub check {
$self->exempt_amount(0) unless $self->exempt_amount;
$self->ut_numbern('taxnum')
- || $self->ut_textn('state')
+ || $self->ut_anything('state')
|| $self->ut_textn('county')
|| $self->ut_text('country')
|| $self->ut_float('tax')
@@ -157,13 +157,13 @@ sub recurtax {
=over 4
-=item regionselector [ COUNTY STATE COUNTRY [ PREFIX [ ONCHANGE ] ] ]
+=item regionselector [ COUNTY STATE COUNTRY [ PREFIX [ ONCHANGE [ DISABLED ] ] ] ]
=cut
sub regionselector {
my ( $selected_county, $selected_state, $selected_country,
- $prefix, $onchange ) = @_;
+ $prefix, $onchange, $disabled ) = @_;
$prefix = '' unless defined $prefix;
@@ -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";
}
@@ -238,7 +239,7 @@ END
my $county_html = $script_html;
if ( $countyflag ) {
- $county_html .= qq!';
my $country_html = qq!!;
+ qq!onChange="${prefix}country_changed(this); $onchange" $disabled>!;
my $countrydefault = $conf->config('countrydefault') || 'US';
foreach my $country (
sort { ($b eq $countrydefault) <=> ($a eq $countrydefault) or $a cmp $b }
keys %cust_main_county
) {
my $selected = $country eq $selected_country ? ' SELECTED' : '';
- $country_html .= "\n"
+ $country_html .= qq(\n");
}
$country_html .= '';