From e66bb1fd7c14904103fbf28daa1d9370ad36beba Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 21 Dec 2009 02:00:56 +0000 Subject: [PATCH] have 'Bill now' link cancel expired (and suspend adjourned) packages, and catch and return errors in all cases, RT#6627 --- FS/FS/cust_main.pm | 83 +++++++++++++++++++++++++++++++--------- httemplate/misc/bill.cgi | 13 ++----- 2 files changed, 67 insertions(+), 29 deletions(-) diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 250c40f69..78a41f7ae 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -2333,9 +2333,11 @@ sub agent { =item bill_and_collect Cancels and suspends any packages due, generates bills, applies payments and -cred +credits, and applies collection events to run cards, send bills and notices, +etc. -Warns on errors (Does not currently: If there is an error, returns the error, otherwise returns false.) +By default, warns on errors and continues with the next operation (but see the +"fatal" flag below). Options are passed as name-value pairs. Currently available options are: @@ -2361,6 +2363,12 @@ Used in conjunction with the I