From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 8 May 2013 12:09:37 +0000 (-0700)
Subject: fix cch update adding a TAXCAT, RT#21687
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=5c7c467af6e6880b05df8bd04a6744e72d8d0577

fix cch update adding a TAXCAT, RT#21687
---

diff --git a/FS/FS/tax_class.pm b/FS/FS/tax_class.pm
index 79bb24836..7fe102385 100644
--- a/FS/FS/tax_class.pm
+++ b/FS/FS/tax_class.pm
@@ -84,9 +84,6 @@ sub delete {
   my $self = shift;
 
   return "Can't delete a tax class which has package tax rates!"
-    if qsearch( 'part_pkg_taxrate', { 'taxclassnum' => $self->taxclassnum } );
-
-  return "Can't delete a tax class which has package tax rates!"
     if qsearch( 'part_pkg_taxrate', { 'taxclassnumtaxed' => $self->taxclassnum } );
 
   return "Can't delete a tax class which has package tax overrides!"
@@ -113,6 +110,16 @@ sub delete {
     }
   }
 
+  foreach my $part_pkg_taxrate (
+    qsearch( 'part_pkg_taxrate', { taxclassnum=>$self->taxclassnum } )
+  ) {
+    my $error = $part_pkg_taxrate->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
   my $error = $self->SUPER::delete(@_);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;