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

diff --combined FS/FS/Schema.pm
index b6358b9,e854dc6..ca6d169
--- 1/FS/FS/Schema.pm
--- 2/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@@ -1039,7 -1039,7 +1039,7 @@@ sub tables_hashref 
          'classnum', 'int', 'NULL', '', '', '',
          'duration', 'int', 'NULL', '',  0, '',
          'phonenum', 'varchar', 'NULL', 255, '', '', # has to hold a service label
-         'accountcode', 'varchar',  'NULL',      20, '', '',
+         'accountcode', 'varchar',  'NULL',      32, '', '',
          'startdate',  @date_type, '', '', 
          'regionname', 'varchar', 'NULL', $char_d, '', '',
          'detail',  'varchar', '', 255, '', '',
@@@ -1243,7 -1243,7 +1243,7 @@@
          'classnum', 'int', 'NULL', '', '', '',
          'duration', 'int', 'NULL', '',  0, '',
          'phonenum', 'varchar', 'NULL', 255, '', '',
-         'accountcode', 'varchar',  'NULL',      20, '', '',
+         'accountcode', 'varchar',  'NULL',      32, '', '',
          'startdate',  @date_type, '', '', 
          'regionname', 'varchar', 'NULL', $char_d, '', '',
          'detail',  'varchar', '', 255, '', '', 
@@@ -1526,27 -1526,6 +1526,27 @@@
                          ],
      },
  
 +    'cust_credit_source_bill_pkg' => {
 +      'columns' => [
 +        'creditsourcebillpkgnum', 'serial',     '', '', '', '',
 +        'crednum',                   'int',     '', '', '', '',
 +        'billpkgnum',                'int',     '', '', '', '',
 +        'amount',              @money_type,             '', '',
 +        'currency',                 'char', 'NULL',  3, '', '',
 +      ],
 +      'primary_key'  => 'creditsourcebillpkgnum',
 +      'unique'       => [],
 +      'index'        => [ ['crednum'], ['billpkgnum'] ],
 +      'foreign_keys' => [
 +                          { columns => ['billpkgnum'],
 +                            table   => 'cust_bill_pkg',
 +                          },
 +                          { columns => ['crednum'],
 +                            table   => 'cust_credit',
 +                          },
 +                        ],
 +    },
 +
      'cust_main' => {
        'columns' => [
          'custnum',  'serial',  '',     '', '', '', 
@@@ -5256,7 -5235,7 +5256,7 @@@
          'billsec',     'int',      '',      '',     0, '', 
          'disposition', 'varchar',  '',      45, \"''", '',
          'amaflags',    'int',      '',      '',     0, '',
-         'accountcode', 'varchar',  '',      20, \"''", '',
+         'accountcode', 'varchar',  '',      32, \"''", '',
          'uniqueid',    'varchar',  '', $char_d, \"''", '',
          'userfield',   'varchar',  '',     512, \"''", '',