[freeside-commits] branch master updated. 2f83aa0920cd03724adf25b7ffb89890d43d96ce

Ivan ivan at 420.am
Tue Apr 29 21:02:19 PDT 2014


The branch, master has been updated
       via  2f83aa0920cd03724adf25b7ffb89890d43d96ce (commit)
       via  884f9a3759cb4eff914a82f4317ce94f7371b020 (commit)
      from  664189df19ccc7bd6d39dea57c63c4d6a021d02f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2f83aa0920cd03724adf25b7ffb89890d43d96ce
Merge: 884f9a3 664189d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Apr 29 21:02:15 2014 -0700

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


commit 884f9a3759cb4eff914a82f4317ce94f7371b020
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Apr 29 21:01:40 2014 -0700

    fix nascent vendor stuff for FKs

diff --git a/FS/FS/vend_bill_pay.pm b/FS/FS/vend_bill_pay.pm
index 165193f..9277ad9 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;
   '';
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/vend_bill_pay.pm |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)




More information about the freeside-commits mailing list