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

diff --combined FS/FS/Schema.pm
index 0447892,1661f35..17fa2d8
--- 1/FS/FS/Schema.pm
--- 2/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@@ -5676,45 -5676,6 +5676,45 @@@ sub tables_hashref 
                          ],
      },
  
 +    'pbx_device' => {
 +      'columns' => [
 +        'devicenum', 'serial',     '', '', '', '',
 +        'devicepart',   'int',     '', '', '', '',
 +        'svcnum',       'int',     '', '', '', '', 
 +        'mac_addr', 'varchar', 'NULL', 12, '', '', 
 +      ],
 +      'primary_key'  => 'devicenum',
 +      'unique'       => [ [ 'mac_addr' ], ],
 +      'index'        => [ [ 'devicepart' ], [ 'svcnum' ], ],
 +      'foreign_keys' => [
 +                          { columns    => [ 'devicepart' ],
 +                            table      => 'part_device',
 +                          },
 +                          { columns    => [ 'svcnum' ],
 +                            table      => 'svc_pbx',
 +                          },
 +                        ],
 +    },
 +
 +    'extension_device' => {
 +      'columns' => [
 +        'extensiondevicenum', 'serial', '', '', '', '',
 +        'extensionnum',          'int', '', '', '', '',
 +        'devicenum',             'int', '', '', '', '',
 +      ],
 +      'primary_key'  => 'extensiondevicenum',
 +      'unique'       => [ [ 'extensionnum', 'devicenum' ] ],
 +      'index'        => [],#both?  which way do we need to query?
 +      'foreign_keys' => [
 +                          { columns  => [ 'extensionnum' ],
 +                            table    => 'pbx_extension',
 +                          },
 +                          { columns  => [ 'devicenum' ],
 +                            table    => 'pbx_device',
 +                          },
 +                        ],
 +    },
 +
      'svc_mailinglist' => { #svc_group?
        'columns' => [
          'svcnum',            'int',     '',            '', '', '', 
@@@ -6369,21 -6330,9 +6369,9 @@@
          'latexnotes',           'text',     'NULL', '', '', '',
          'latexfooter',          'text',     'NULL', '', '', '',
          'latexsummary',         'text',     'NULL', '', '', '',
-         'latexcoupon',          'text',     'NULL', '', '', '',
          'latexsmallfooter',     'text',     'NULL', '', '', '',
          'latexreturnaddress',   'text',     'NULL', '', '', '',
-         'latextopmargin',       'varchar',  'NULL', 16, '', '',
-         'latexheadsep',         'varchar',  'NULL', 16, '', '',
-         'latexaddresssep',      'varchar',  'NULL', 16, '', '',
-         'latextextheight',      'varchar',  'NULL', 16, '', '',
-         'latexextracouponspace','varchar',  'NULL', 16, '', '',
-         'latexcouponfootsep',   'varchar',  'NULL', 16, '', '',
-         'latexcouponamountenclosedsep', 'varchar',  'NULL', 16, '', '',
-         'latexcoupontoaddresssep',      'varchar',  'NULL', 16, '', '',
-         'latexverticalreturnaddress',      'char',  'NULL',  1, '', '',
-         'latexcouponaddcompanytoaddress',  'char',  'NULL',  1, '', '',
-         'logo_png',             'blob',     'NULL', '', '', '',
-         'logo_eps',             'blob',     'NULL', '', '', '',
+         'with_latexcoupon',     'char',     'NULL', '1', '', '',
          'lpr',                  'varchar',  'NULL', $char_d, '', '',
        ],
        'primary_key'  => 'confnum',