texas tax!

[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 17fe164..8e83b1a 100644 (file)
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -57,6 +57,10 @@ currently supported:
 
 =item tax - percentage
 
+=item taxclass
+
+=item exempt_amount
+
 =back
 
 =head1 METHODS
@@ -97,11 +101,15 @@ methods.
 sub check {
   my $self = shift;
 
+  $self->exempt_amount(0) unless $self->exempt_amount;
+
   $self->ut_numbern('taxnum')
     || $self->ut_textn('state')
     || $self->ut_textn('county')
     || $self->ut_text('country')
     || $self->ut_float('tax')
+    || $self->ut_textn('taxclass') # ...
+    || $self->ut_money('exempt_amount')
   ;
 
 }
@@ -119,15 +127,17 @@ sub check {
 sub regionselector {
   my ( $selected_county, $selected_state, $selected_country,
        $prefix, $onchange ) = @_;
-  $countyflag=1 if $selected_county;
 
-  unless ( @cust_main_county ) { #cache 
+  $countyflag = 0;
+
+#  unless ( @cust_main_county ) { #cache 
     @cust_main_county = qsearch('cust_main_county', {} );
     foreach my $c ( @cust_main_county ) {
       $countyflag=1 if $c->county;
       push @{$cust_main_county{$c->country}{$c->state}}, $c->county;
     }
-  }
+#  }
+  $countyflag=1 if $selected_county;
 
   my $script_html = <<END;
     <SCRIPT>
@@ -225,7 +235,7 @@ END
 
 =head1 BUGS
 
-regionseletor?  putting web ui components in here?  they should probably live
+regionselector?  putting web ui components in here?  they should probably live
 somewhere else...
 
 =head1 SEE ALSO