X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_tax_exempt_pkg_void.pm;h=ed793d53be80aa028fa2562976c663a78a40471e;hb=64cb9f480fae2da57bcf760f74212d1f270c9290;hp=bfbc8c739db64fa4e4a4a904c1ef0df952ada930;hpb=82d8565fbeaebd69177a3a14d833685ecb86a545;p=freeside.git diff --git a/FS/FS/cust_tax_exempt_pkg_void.pm b/FS/FS/cust_tax_exempt_pkg_void.pm index bfbc8c739..ed793d53b 100644 --- a/FS/FS/cust_tax_exempt_pkg_void.pm +++ b/FS/FS/cust_tax_exempt_pkg_void.pm @@ -110,10 +110,11 @@ and replace methods. sub check { my $self = shift; - my $error = + my $error = $self->ut_number('exemptpkgnum') || $self->ut_foreign_key('billpkgnum', 'cust_bill_pkg_void', 'billpkgnum' ) - || $self->ut_foreign_key('taxnum', 'cust_main_county', 'taxnum') + || $self->ut_enum('taxtype', [ 'FS::cust_main_county', 'FS::tax_rate' ]) + || $self->ut_number('taxnum') || $self->ut_numbern('year') || $self->ut_numbern('month') || $self->ut_numbern('creditbillpkgnum') #no FK check, will have been del'ed @@ -124,6 +125,11 @@ sub check { || $self->ut_flag('exempt_cust_taxname') || $self->ut_flag('exempt_monthly') ; + + $self->get('taxtype') =~ /^FS::(\w+)$/; + my $rate_table = $1; + $error ||= $self->ut_foreign_key('taxnum', $rate_table, 'taxnum'); + return $error if $error; $self->SUPER::check;