[freeside-commits] branch FREESIDE_3_BRANCH updated. b5c544bc1897ef759e5d198aff3bf173247de1bf

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  b5c544bc1897ef759e5d198aff3bf173247de1bf (commit)
       via  c5b04776fb253b2077951ed3641d7b7d36258391 (commit)
      from  5778beb6849b2383068aa7c627e6968fe92419eb (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 b5c544bc1897ef759e5d198aff3bf173247de1bf
Merge: c5b0477 5778beb
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jun 19 15:29:44 2013 -0700

    Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH


commit c5b04776fb253b2077951ed3641d7b7d36258391
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jun 19 15:28:42 2013 -0700

    deprecated customer deletion

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 1fc419a..a285639 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1053,7 +1053,7 @@ sub reason_type_options {
 
   {
     'key'         => 'deletecustomers',
-    'section'     => 'UI',
+    'section'     => 'deprecated',
     'description' => 'Enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that the customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers\' packages if they cancel service.',
     'type'        => 'checkbox',
   },
@@ -1061,7 +1061,7 @@ sub reason_type_options {
   {
     'key'         => 'deleteinvoices',
     'section'     => 'UI',
-    'description' => 'Enable invoices deletions.  Be very careful!  Deleting an invoice will remove all traces that the invoice ever existed!  Normally, you would apply a credit against the invoice instead.',  #invoice voiding?
+    'description' => 'Enable invoices deletions.  Be very careful!  Deleting an invoice will remove all traces that the invoice ever existed!  Normally, you would void or apply a credit against the invoice instead.',
     'type'        => 'checkbox',
   },
 

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

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