X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_bill_pkg_tax_location.pm;h=44dd6e3c4c138c66518840a6485dd08eed19f2db;hb=80511cb4158b98db01deec317e5408675487bc6e;hp=0d3bd3a3247efe7a76e3175fda7922e94e798ef5;hpb=40a7b3dc653e099f7bd0bd762b649b04c4432db2;p=freeside.git

diff --git a/FS/FS/cust_bill_pkg_tax_location.pm b/FS/FS/cust_bill_pkg_tax_location.pm
index 0d3bd3a32..44dd6e3c4 100644
--- a/FS/FS/cust_bill_pkg_tax_location.pm
+++ b/FS/FS/cust_bill_pkg_tax_location.pm
@@ -8,6 +8,7 @@ use FS::cust_pkg;
 use FS::cust_location;
 use FS::cust_bill_pay_pkg;
 use FS::cust_credit_bill_pkg;
+use FS::cust_main_county;
 
 =head1 NAME
 
@@ -161,7 +162,10 @@ sub desc {
                            map { $cust_location->$_ }
                            qw( state county city )     # country?
   );
-  $self->cust_bill_pkg->desc. " ($location)";
+  my $cust_bill_pkg_desc = $self->billpkgnum
+                         ? $self->cust_bill_pkg->desc
+                         : $self->cust_bill_pkg_desc;
+  "$cust_bill_pkg_desc ($location)";
 }
 
 =item owed
@@ -196,10 +200,21 @@ sub cust_credit_bill_pkg {
          );
 }
 
+sub cust_main_county {
+  my $self = shift;
+  my $result;
+  if ( $self->taxtype eq 'FS::cust_main_county' ) {
+    $result = qsearchs( 'cust_main_county', { 'taxnum' => $self->taxnum } );
+  }
+}
+
 =back
 
 =head1 BUGS
 
+The presense of FS::cust_main_county::delete makes the cust_main_county method
+unreliable
+
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.