X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_credit_bill_pkg.pm;h=3cb44a092e7426afea3fdf2ca82d3e6a70aeec31;hb=7b5a266236857fbb4bbf8d4ac3031c3fec75cac2;hp=418900785e43298b6b3163d0269dbabb41db803e;hpb=0af38652da3b3be7da2d35b048285ef6f2194e1a;p=freeside.git

diff --git a/FS/FS/cust_credit_bill_pkg.pm b/FS/FS/cust_credit_bill_pkg.pm
index 418900785..3cb44a092 100644
--- a/FS/FS/cust_credit_bill_pkg.pm
+++ b/FS/FS/cust_credit_bill_pkg.pm
@@ -277,7 +277,7 @@ sub delete {
     $sum = sprintf("%.2f", $sum);
     unless ($sum eq '0.00' || $sum eq '-0.00') {
       $dbh->rollback if $oldAutoCommit;
-      return "Can't unapply credit without charging tax";
+      return "Can't unapply credit without charging tax of $sum";
     }
   }
    
@@ -348,13 +348,13 @@ sub cust_bill_pkg {
 
 sub cust_bill_pkg_tax_Xlocation {
   my $self = shift;
-  if ($self->billpkg_tax_locationnum) {
+  if ($self->billpkgtaxlocationnum) {
     return qsearchs(
       'cust_bill_pkg_tax_location',
       { 'billpkgtaxlocationnum' => $self->billpkgtaxlocationnum },
     );
  
-  } elsif ($self->billpkg_tax_rate_locationnum) {
+  } elsif ($self->billpkgtaxratelocationnum) {
     return qsearchs(
       'cust_bill_pkg_tax_rate_location',
       { 'billpkgtaxratelocationnum' => $self->billpkgtaxratelocationnum },