[freeside-commits] branch master updated. 8e50b6f6fbaa9d732a371114c0dfc95c326cb890

[Jonathan Prykop]

The branch, master has been updated
       via  8e50b6f6fbaa9d732a371114c0dfc95c326cb890 (commit)
      from  cd1a490338a5da42ab94b62b24231aa14dd5d048 (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 8e50b6f6fbaa9d732a371114c0dfc95c326cb890
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Thu Mar 12 20:16:25 2015 -0500

    RT#14671 [documentation changes only]

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 5bb3d2a..efe35ef 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -785,14 +785,9 @@ to a different pkgpart or location, and probably shouldn't be in any other
 case.  If it's not set, the 'unused_credit_cancel' part_pkg option will 
 be used.
 
-=item delay_cancel - for internal use, to allow proper handling of
-supplemental packages when the main package is flagged to suspend 
-before cancelling, probably shouldn't be used otherwise (set the
-corresponding package option instead)
-
-=item no_delay_cancel - for internal use, prevents delay_cancel behavior
+=item no_delay_cancel - prevents delay_cancel behavior
 no matter what other options say, for use when changing packages (or any
-other time you're really sure you want an unadulterated cancel)
+other time you're really sure you want an immediate cancel)
 
 =back
 
@@ -800,6 +795,12 @@ If there is an error, returns the error, otherwise returns false.
 
 =cut
 
+#NOT DOCUMENTING - this should only be used when calling recursively
+#=item delay_cancel - for internal use, to allow proper handling of
+#supplemental packages when the main package is flagged to suspend 
+#before cancelling, probably shouldn't be used otherwise (set the
+#corresponding package option instead)
+
 sub cancel {
   my( $self, %options ) = @_;
   my $error;

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

Summary of changes:
 FS/FS/cust_pkg.pm |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)