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

diff --combined FS/FS/Schema.pm
index e63dba6,6a156a5..da128d5
--- 1/FS/FS/Schema.pm
--- 2/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@@ -1967,6 -1967,26 +1967,26 @@@ sub tables_hashref 
                          ],
      },
  
+     'quotation_pkg_tax' => {
+       'columns' => [
+         'quotationtaxnum',  'serial',     '',      '', '', '',
+         'quotationpkgnum',     'int',     '',      '', '', '',
+         'itemdesc',        'varchar',     '', $char_d, '', '',
+         'taxnum',              'int',     '',      '', '', '', 
+         'taxtype',         'varchar',     '', $char_d, '', '',
+         'setup_amount',    @money_type,                '', '',
+         'recur_amount',    @money_type,                '', '',
+       ],
+       'primary_key' => 'quotationtaxnum',,
+       'unique' => [],
+       'index'  => [ [ 'quotationpkgnum' ] ],
+       'foreign_keys' => [
+                           { columns    => [ 'quotationpkgnum' ],
+                             table      => 'quotation_pkg',
+                           },
+                         ],
+ },
+ 
      'cust_location' => { #'location' now that its prospects too, but...
        'columns' => [
          'locationnum',      'serial',     '',      '', '', '',
@@@ -2776,11 -2796,11 +2796,11 @@@
  
      'cust_pkg_detail' => {
        'columns' => [
 -        'pkgdetailnum', 'serial', '',      '', '', '',
 -        'pkgnum',          'int', '',      '', '', '',
 -        'detail',      'varchar', '', $char_d, '', '', 
 -        'detailtype',     'char', '',       1, '', '', # "I"nvoice or "C"omment
 -        'weight',          'int', '',      '', '', '',
 +        'pkgdetailnum', 'serial', '',        '', '', '',
 +        'pkgnum',          'int', '',        '', '', '',
 +        'detail',      'varchar', '', 2*$char_d, '', '', 
 +        'detailtype',     'char', '',         1, '', '', #"I"nvoice or "C"omment
 +        'weight',          'int', '',        '', '', '',
        ],
        'primary_key'  => 'pkgdetailnum',
        'unique'       => [],