diff options
| -rw-r--r-- | FS/FS/cust_main.pm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index fb4b153b2..cc0e83f23 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -5429,7 +5429,13 @@ sub process_bill_and_collect { $param->{'fatal'} = 1; # runs from job queue, will be caught $param->{'retry'} = 1; - $cust_main->bill_and_collect( %$param ); + local $@; + eval { $cust_main->bill_and_collect( %$param) }; + if ( $@ ) { + die $@ =~ /cancel_pkgs cannot be run inside a transaction/ + ? "Bill Now unavailable for customer with pending package expiration\n" + : $@; + } } =item pending_invoice_count |