[freeside-commits] branch master updated. c2ba32903b5314972821cc4f4b787369f57cd3cb

[Jonathan Prykop]

The branch, master has been updated
       via  c2ba32903b5314972821cc4f4b787369f57cd3cb (commit)
      from  2c9afab170b692b81afa1339145224530051c0b6 (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 c2ba32903b5314972821cc4f4b787369f57cd3cb
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Tue Apr 5 21:13:12 2016 -0500

    RT#39368: Automatically suspend for one day before cancelling modification

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 248954a..d0b1180 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -4542,11 +4542,11 @@ and customer address. Include units.',
   {
     'key'         => 'part_pkg-delay_cancel-days',
     'section'     => '',
-    'description' => 'Expire packages in this many days when using delay_cancel (default is 1)',
+    'description' => 'Number of days to suspend when using automatic suspension period before cancel (default is 1)',
     'type'        => 'text',
     'validate'    => sub { (($_[0] =~ /^\d*$/) && (($_[0] eq '') || $_[0]))
-                           ? 'Must specify an integer number of days'
-                           : '' }
+                           ? ''
+                           : 'Must specify an integer number of days' }
   },
 
   {
diff --git a/FS/FS/part_pkg/global_Mixin.pm b/FS/FS/part_pkg/global_Mixin.pm
index 2318c3e..1d2a601 100644
--- a/FS/FS/part_pkg/global_Mixin.pm
+++ b/FS/FS/part_pkg/global_Mixin.pm
@@ -41,7 +41,7 @@ tie my %a2billing_simultaccess, 'Tie::IxHash', (
       'type' => 'checkbox',
     },
     'delay_cancel' => {
-      'name' => 'Automatically suspend for one day before cancelling',
+      'name' => 'Automatic suspension period before cancelling',
       'type' => 'checkbox',
     },
 

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

Summary of changes:
 FS/FS/Conf.pm                  |    6 +++---
 FS/FS/part_pkg/global_Mixin.pm |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)