Virtual field merge

[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 28f69c2..f631d8c 100644 (file)
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -61,6 +61,8 @@ currently supported:
 
 =item exempt_amount
 
+=item taxname - if defined, printed on invoices instead of "Tax"
+
 =back
 
 =head1 METHODS
@@ -110,7 +112,10 @@ sub check {
     || $self->ut_float('tax')
     || $self->ut_textn('taxclass') # ...
     || $self->ut_money('exempt_amount')
-  ;
+    || $self->ut_textn('taxname')
+    || $self->SUPER::check
+    ;
+
 
 }
 
@@ -128,6 +133,8 @@ sub regionselector {
   my ( $selected_county, $selected_state, $selected_country,
        $prefix, $onchange ) = @_;
 
+  $prefix = '' unless defined $prefix;
+
   $countyflag = 0;
 
 #  unless ( @cust_main_county ) { #cache