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

diff --combined FS/FS/Conf.pm
index 321ba0b,667263f..b72cf03
--- 1/FS/FS/Conf.pm
--- 2/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -1363,7 -1363,7 +1363,7 @@@ and customer address. Include units.'
    {
      'key'         => 'invoice_latexextracouponspace',
      'section'     => 'invoicing',
 -    'description' => 'Optional LaTeX invoice textheight space to reserve for a tear off coupon. Include units.',
 +    'description' => 'Optional LaTeX invoice textheight space to reserve for a tear off coupon.  Include units.  Default is 3.6cm',
      'type'        => 'text',
      'per_agent'   => 1,
      'validate'    => sub { shift =~
@@@ -2555,7 -2555,6 +2555,7 @@@
      'section'     => 'billing',
      'description' => 'Package to add to each manual credit card and ACH payment entered by employees from the backend.  Enabling this option may be in violation of your merchant agreement(s), so please check it(/them) carefully before enabling this option.',
      'type'        => 'select-part_pkg',
 +    'per_agent'   => 1,
    },
  
    {
@@@ -2581,7 -2580,6 +2581,7 @@@
      'section'     => 'billing',
      'description' => 'Package to add to each manual credit card and ACH payment entered by the customer themselves in the self-service interface.  Enabling this option may be in violation of your merchant agreement(s), so please check it(/them) carefully before enabling this option.',
      'type'        => 'select-part_pkg',
 +    'per_agent'   => 1,
    },
  
    {
@@@ -3303,7 -3301,7 +3303,7 @@@
    {
      'key'         => 'cust_pkg-show_fcc_voice_grade_equivalent',
      'section'     => 'UI',
-     'description' => "Show a field on package definitions for assigning a DS0 equivalency number suitable for use on FCC form 477.",
+     'description' => "Show fields on package definitions for FCC Form 477 classification",
      'type'        => 'checkbox',
    },
  

diff --combined FS/FS/Schema.pm
index b1e7a9c,ab679c4..37bba68
--- 1/FS/FS/Schema.pm
--- 2/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@@ -937,7 -937,6 +937,7 @@@ sub tables_hashref 
          'closed',    'char', 'NULL', 1, '', '', 
          'pkgnum', 'int', 'NULL', '', '', '', #desired pkgnum for pkg-balances
          'eventnum', 'int', 'NULL', '', '', '', #triggering event for commission
 +        #'commission_agentnum', 'int', 'NULL', '', '', '', #
        ],
        'primary_key' => 'crednum',
        'unique' => [],
@@@ -1912,6 -1911,7 +1912,7 @@@
          'credit_weight', 'real',    'NULL', '', '', '',
          'agentnum',      'int',     'NULL', '', '', '', 
          'fcc_ds0s',      'int',     'NULL', '', '', '', 
+         'fcc_voip_class','char',    'NULL',  1, '', '',
          'no_auto',          'char', 'NULL',  1, '', '', 
          'recur_show_zero',  'char', 'NULL',  1, '', '',
          'setup_show_zero',  'char', 'NULL',  1, '', '',