fix problems with code that resets invoice events

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b6600fb..6be6cdb 100644 (file)
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -493,7 +493,10 @@ sub replace {
                && $_->status eq 'done'
                && $_->statustext
            }
-        $self->open_cust_bill->cust_bill_event
+        map { $_->cust_bill_event }
+          grep { $_->cust_bill_event }
+            $self->open_cust_bill
+
     ) {
       my $error = $cust_bill_event->retry;
       if ( $error ) {
@@ -1237,7 +1240,9 @@ sub collect {
                && $_->status eq 'done'
                && $_->statustext
            }
-        $self->open_cust_bill->cust_bill_event
+        map { $_->cust_bill_event }
+          grep { $_->cust_bill_event }
+            $self->open_cust_bill
     ) {
       my $error = $cust_bill_event->retry;
       if ( $error ) {