From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 30 Apr 2014 04:02:15 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=2f83aa0920cd03724adf25b7ffb89890d43d96ce;hp=664189df19ccc7bd6d39dea57c63c4d6a021d02f

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---

diff --git a/FS/FS/vend_bill_pay.pm b/FS/FS/vend_bill_pay.pm
index 165193fa3..9277ad90d 100644
--- a/FS/FS/vend_bill_pay.pm
+++ b/FS/FS/vend_bill_pay.pm
@@ -83,6 +83,12 @@ sub delete {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  my $error = $self->SUPER::delete;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
   #magically auto-deleting for the simple case
   foreach my $vend_pay ( $self->vend_pay ) {
     my $error = $vend_pay->delete;
@@ -92,12 +98,6 @@ sub delete {
     }
   }
 
-  my $error = $self->SUPER::delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';