master will be 4.0

[freeside.git] / FS / FS / cust_credit_bill_pkg.pm

diff --git a/FS/FS/cust_credit_bill_pkg.pm b/FS/FS/cust_credit_bill_pkg.pm
index 4189007..3cb44a0 100644 (file)
--- 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 },