X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_credit_bill_pkg.pm;h=71b674c6cd17fc7f2b4b2282cfebaac41056ac25;hb=459e2cda8a891cc062d39780991d631b6f2c6b6d;hp=be9cd70bdb4acc5167e156a1bbcc724f2b5db63f;hpb=32072dbf59a054529f5304574c0f56f9567d14d0;p=freeside.git

diff --git a/FS/FS/cust_credit_bill_pkg.pm b/FS/FS/cust_credit_bill_pkg.pm
index be9cd70bd..71b674c6c 100644
--- a/FS/FS/cust_credit_bill_pkg.pm
+++ b/FS/FS/cust_credit_bill_pkg.pm
@@ -37,7 +37,7 @@ The following fields are currently supported:
 
 =item creditbillpkgnum -  primary key
 
-=item creditbillnum - Credit application to the overall invoice (see L<FS::cust_credit::bill>)
+=item creditbillnum - Credit application to the overall invoice (see L<FS::cust_credit_bill>)
 
 =item billpkgnum - Line item to which credit is applied (see L<FS::cust_bill_pkg>)
 
@@ -112,7 +112,7 @@ sub insert {
 
   if ($taxable_per_month >= 0) {  #panic if its subzero?
     my $groupby = join(',',
-      qw(taxnum year month exempt_monthly exempt_cust 
+      qw(taxnum taxtype year month exempt_monthly exempt_cust 
          exempt_cust_taxname exempt_setup exempt_recur));
     my $sum = 'SUM(amount)';
     my @exemptions = qsearch(
@@ -140,7 +140,7 @@ sub insert {
         # (above the remaining taxable charge amount).  We'll "de-exempt"
         # that much, or the amount of the new credit, whichever is smaller.
         if ($amount > $credit_per_month) {
-               "cust_bill_pkg ". $self->billpkgnum. "  Reducing.\n";
+          #warn "cust_bill_pkg ". $self->billpkgnum. "  Reducing.\n";
           $amount = $credit_per_month;
         }
       } elsif ( $exemption->exempt_setup or $exemption->exempt_recur ) {
@@ -166,11 +166,16 @@ sub insert {
         'amount'           => sprintf('%.2f', 0-$amount),
       };
 
-      my $error = $cust_tax_exempt_pkg->insert;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return "error inserting cust_tax_exempt_pkg: $error";
+      if ( $cust_tax_exempt_pkg->cust_main_county ) {
+
+        my $error = $cust_tax_exempt_pkg->insert;
+        if ( $error ) {
+          $dbh->rollback if $oldAutoCommit;
+          return "error inserting cust_tax_exempt_pkg: $error";
+        }
+
       }
+
     } #foreach $exemption
   }