Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined FS/FS/Conf.pm
index 5813332,ea00748..c0955b1
--- 1/FS/FS/Conf.pm
--- 2/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -1114,7 -1114,7 +1114,7 @@@ sub reason_type_options 
    {
      'key'         => 'unapplycredits',
      'section'     => 'deprecated',
 -    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to nable "unapplication" of unclosed credits.',
 +    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable "unapplication" of unclosed credits.',
      'type'        => 'checkbox',
    },
  
@@@ -3465,13 -3465,6 +3465,6 @@@ and customer address. Include units.'
    },
  
    {
-     'key'         => 'cust_pkg-show_fcc_voice_grade_equivalent',
-     'section'     => 'UI',
-     'description' => "Show fields on package definitions for FCC Form 477 classification",
-     'type'        => 'checkbox',
-   },
- 
-   {
      'key'         => 'cust_pkg-large_pkg_size',
      'section'     => 'UI',
      'description' => "In customer view, summarize packages with more than this many services.  Set to zero to never summarize packages.",
@@@ -3486,6 -3479,13 +3479,13 @@@
    },
  
    {
+     'key'         => 'part_pkg-show_fcc_options',
+     'section'     => 'UI',
+     'description' => "Show fields on package definitions for FCC Form 477 classification",
+     'type'        => 'checkbox',
+   },
+ 
+   {
      'key'         => 'svc_acct-edit_uid',
      'section'     => 'shell',
      'description' => 'Allow UID editing.',
@@@ -5773,6 -5773,13 +5773,13 @@@
                       ],
    },
  
+   {
+     'key'         => 'old_fcc_report',
+     'section'     => '',
+     'description' => 'Use the old (pre-2014) FCC Form 477 report format.',
+     'type'        => 'checkbox',
+   },
+ 
    { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
    { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
    { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },