X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FSchema.pm;h=569401b1d5b54c5e33e0b7af8c6ca6322a5b74ef;hp=2a7a9d1774bce60a65620f754f318b33a47227e8;hb=d2a42bce5c5557966cc0f0966e4b9d14fff576a0;hpb=d5988a9f7a3617de33da3058f2e9f1151b24420e

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 2a7a9d177..569401b1d 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -694,6 +694,7 @@ sub tables_hashref {
         'title',     'varchar', 'NULL', $char_d, '', '',
         'body',      'blob', 'NULL', '', '', '',
         'disabled',  @date_type, '', '',
+        'attachnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'attachnum',
       'unique'       => [],
@@ -1024,6 +1025,7 @@ sub tables_hashref {
         'quantity',               'int', 'NULL',      '', '', '',
         'hidden',                'char', 'NULL',       1, '', '',
         'feepart',                'int', 'NULL',      '', '', '',
+        'billpkgnum_import',      'int', 'NULL',      '', '', '',
       ],
       'primary_key'  => 'billpkgnum',
       'unique'       => [],
@@ -1062,6 +1064,7 @@ sub tables_hashref {
         'startdate',  @date_type, '', '', 
         'regionname', 'varchar', 'NULL', $char_d, '', '',
         'detail',  'varchar', '', 255, '', '',
+        'detailnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'detailnum',
       'unique'       => [],
@@ -1094,6 +1097,7 @@ sub tables_hashref {
         'post_total', 'char', 'NULL', 1, '', '',
         'type',       'char', 'NULL', 1, '', '',
         'summary',    'char', 'NULL', 1, '', '',
+        'billpkgdisplaynum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'billpkgdisplaynum',
       'unique'       => [],
@@ -1159,6 +1163,7 @@ sub tables_hashref {
         'amount',             @money_type,                  '', '',
         'currency',                'char', 'NULL',       3, '', '',
         'taxable_billpkgnum',       'int', 'NULL',      '', '', '',
+        'billpkgtaxlocationnum_import', 'int', 'NULL',  '', '', '',
       ],
       'primary_key'  => 'billpkgtaxlocationnum',
       'unique'       => [],
@@ -1243,6 +1248,7 @@ sub tables_hashref {
         'reason',     'varchar', 'NULL', $char_d, '', '', 
         'reasonnum',      'int', 'NULL',      '', '', '',
         'void_usernum',   'int', 'NULL',      '', '', '',
+        'billpkgnum_import', 'int', 'NULL',   '', '', '',
       ],
       'primary_key'  => 'billpkgnum',
       'unique'       => [],
@@ -1286,6 +1292,7 @@ sub tables_hashref {
         'startdate',  @date_type, '', '', 
         'regionname', 'varchar', 'NULL', $char_d, '', '',
         'detail',  'varchar', '', 255, '', '', 
+        'detailnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'detailnum',
       'unique'       => [],
@@ -1316,6 +1323,7 @@ sub tables_hashref {
         'post_total', 'char', 'NULL', 1, '', '',
         'type',       'char', 'NULL', 1, '', '',
         'summary',    'char', 'NULL', 1, '', '',
+        'billpkgdisplaynum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'billpkgdisplaynum',
       'unique'       => [],
@@ -1338,6 +1346,7 @@ sub tables_hashref {
         'amount',             @money_type,                  '', '',
         'currency',                'char', 'NULL',       3, '', '',
         'taxable_billpkgnum',       'int', 'NULL',      '', '', '',
+        'billpkgtaxlocationnum_import', 'int', 'NULL',  '', '', '',
       ],
       'primary_key'  => 'billpkgtaxlocationnum',
       'unique'       => [],
@@ -1401,7 +1410,8 @@ sub tables_hashref {
         'commission_salesnum', 'int', 'NULL', '', '', '', #
         'commission_pkgnum',   'int', 'NULL', '', '', '', #
         'commission_invnum',   'int', 'NULL', '', '', '',
-        'credbatch',    'varchar', 'NULL', $char_d, '', '',
+        'credbatch',       'varchar', 'NULL', $char_d, '', '',
+        'crednum_import',      'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'crednum',
       'unique'       => [],
@@ -1465,8 +1475,9 @@ sub tables_hashref {
         #void fields
         'void_date',  @date_type,                  '', '', 
         'void_reason', 'varchar', 'NULL', $char_d, '', '', 
-        'void_reasonnum', 'int', 'NULL', '', '', '', 
+        'void_reasonnum',  'int', 'NULL', '', '', '', 
         'void_usernum',    'int', 'NULL',      '', '', '',
+        'crednum_import',  'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'crednum',
       'unique'       => [],
@@ -1525,6 +1536,7 @@ sub tables_hashref {
         '_date',    @date_type, '', '', 
         'amount',   @money_type, '', '', 
         'pkgnum', 'int', 'NULL', '', '', '', #desired pkgnum for pkg-balances
+        'creditbillnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'creditbillnum',
       'unique'       => [],
@@ -1553,6 +1565,7 @@ sub tables_hashref {
         'setuprecur',      'varchar', '', $char_d, '', '',
         'sdate',   @date_type, '', '', 
         'edate',   @date_type, '', '', 
+        'creditbillpkgnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'creditbillpkgnum',
       'unique'       => [],
@@ -1695,6 +1708,7 @@ sub tables_hashref {
         'invoice_attn', 'varchar', 'NULL', $char_d, '', '',
         'invoice_ship_address', 'char', 'NULL', 1, '', '',
         'postal_invoice', 'char', 'NULL', 1, '', '',
+        'paymentreceipt_noemail', 'char', 'NULL', 1, '', '',
       ],
       'primary_key'  => 'custnum',
       'unique'       => [ [ 'agentnum', 'agent_custid' ] ],
@@ -1779,6 +1793,7 @@ sub tables_hashref {
         'classnum',    'serial',   '',      '', '', '', 
         'classname',   'varchar',  '', $char_d, '', '', 
         'disabled',    'char', 'NULL',       1, '', '', 
+        'classnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key' => 'classnum',
       'unique' => [],
@@ -1854,6 +1869,7 @@ sub tables_hashref {
         '_password_encoding', 'varchar', 'NULL', $char_d, '', '',
         'disabled',              'char', 'NULL',       1, '', '', 
         'invoice_dest',          'char', 'NULL',       1, '', '',
+        'contactnum_import',      'int', 'NULL',      '', '', '',
       ],
       'primary_key'  => 'contactnum',
       'unique'       => [],
@@ -1885,6 +1901,7 @@ sub tables_hashref {
         'phonenum',       'varchar',     '', 14, '', '', 
         'extension',      'varchar', 'NULL',  7, '', '',
         #?#'comment',        'varchar',     '', $char_d, '', '', 
+        'contactphonenum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'contactphonenum',
       'unique'       => [],
@@ -1915,6 +1932,7 @@ sub tables_hashref {
         'contactemailnum', 'serial', '',      '', '', '',
         'contactnum',         'int', '',      '', '', '',
         'emailaddress',   'varchar', '', $char_d, '', '',
+        'contactemailnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'contactemailnum',
       #'unique'       => [ [ 'contactnum', 'emailaddress' ], ],
@@ -2103,6 +2121,7 @@ sub tables_hashref {
 
         'incorporated',       'char', 'NULL',       1, '', '',
         'disabled',           'char', 'NULL',       1, '', '', 
+        'locationnum_import',  'int', 'NULL',      '', '', '',
       ],
       'primary_key'  => 'locationnum',
       'unique'       => [],
@@ -2125,6 +2144,7 @@ sub tables_hashref {
         'destnum',  'serial',  '',     '', '', '', 
         'custnum',  'int',  '',     '', '', '', 
         'dest',     'varchar', '',  $char_d, '', '', 
+        'destnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'destnum',
       'unique'       => [],
@@ -2166,6 +2186,7 @@ sub tables_hashref {
         'usernum',      'int', 'NULL', '', '', '',
         'comments',    'text', 'NULL', '', '', '', 
         'sticky',       'int',     '', '',  0, '',
+        'notenum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'notenum',
       'unique'       => [],
@@ -2199,7 +2220,8 @@ sub tables_hashref {
         'categorynum',   'serial',  '', '', '', '', 
         'categoryname',  'varchar', '', $char_d, '', '', 
         'weight',         'int', 'NULL',  '', '', '',
-        'disabled',      'char', 'NULL',   1, '', '', 
+        'disabled',      'char', 'NULL',   1, '', '',
+        'categorynum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key' => 'categorynum',
       'unique' => [],
@@ -2317,6 +2339,7 @@ sub tables_hashref {
         'setuptax',    'char', 'NULL',       1, '', '', # Y = setup tax exempt
         'recurtax',    'char', 'NULL',       1, '', '', # Y = recur tax exempt
         'source',   'varchar', 'NULL', $char_d, '', '',
+        'charge_prediscount', 'char', 'NULL', 1, '', '', # Y = charge this tax pre discount
       ],
       'primary_key' => 'taxnum',
       'unique' => [],
@@ -2528,6 +2551,7 @@ sub tables_hashref {
         'processor',   'varchar', 'NULL', $char_d, '', '', # module name
         'auth',        'varchar', 'NULL',      16, '', '', # CC auth number
         'order_number','varchar', 'NULL', 256, '', '', # transaction number
+        'paynum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'paynum',
       #i guess not now, with cust_pay_pending, if we actually make it here, we _do_ want to record it# 'unique' => [ [ 'payunique' ] ],
@@ -2590,6 +2614,8 @@ sub tables_hashref {
         'reason',      'varchar', 'NULL', $char_d, '', '', 
         'reasonnum',       'int', 'NULL',      '', '', '', 
         'void_usernum',    'int', 'NULL',      '', '', '',
+
+        'paynum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'paynum',
       'unique'       => [],
@@ -2630,6 +2656,7 @@ sub tables_hashref {
         'amount',  @money_type, '', '', 
         '_date',   @date_type, '', '', 
         'pkgnum', 'int', 'NULL', '', '', '', #desired pkgnum for pkg-balances
+        'billpaynum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'billpaynum',
       'unique'       => [],
@@ -2679,6 +2706,7 @@ sub tables_hashref {
         'setuprecur',      'varchar', '', $char_d, '', '',
 	'sdate',   @date_type, '', '', 
         'edate',   @date_type, '', '', 
+        'billpaypkgnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'billpaypkgnum',
       'unique'       => [],
@@ -2709,6 +2737,7 @@ sub tables_hashref {
         'upload',         @date_type,     '', '', 
         'title',   'varchar', 'NULL',255, '', '',
         'processor_id',   'varchar', 'NULL',255, '', '',
+        'type',      'char',  '',  6, 'DEBIT', '', # DEBIT/CREDIT
       ],
       'primary_key'  => 'batchnum',
       'unique'       => [],
@@ -2891,6 +2920,7 @@ sub tables_hashref {
         'pkgnum', 'int', '', '', '', '', 
         'optionname', 'varchar', '', $char_d, '', '', 
         'optionvalue', 'text', 'NULL', '', '', '', 
+        'optionnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'optionnum',
       'unique'       => [],
@@ -2909,6 +2939,7 @@ sub tables_hashref {
         'detail',      'varchar', '', 2*$char_d, '', '', 
         'detailtype',     'char', '',         1, '', '', #"I"nvoice or "C"omment
         'weight',          'int', '',        '', '', '',
+        'pkgdetailnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'pkgdetailnum',
       'unique'       => [],
@@ -2929,6 +2960,7 @@ sub tables_hashref {
         'otaker',   'varchar', 'NULL', 32, '', '', 
         'usernum',   'int', 'NULL', '', '', '',
         'date',     @date_type, '', '', 
+        'num_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'num',
       'unique'       => [],
@@ -2980,6 +3012,7 @@ sub tables_hashref {
         'usernum',           'int', 'NULL',    '', '', '',
         'disabled',         'char', 'NULL',     1, '', '', 
         'setuprecur',       'char', 'NULL',     5, '', '',
+        'pkgdiscountnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'pkgdiscountnum',
       'unique'       => [],
@@ -3044,6 +3077,7 @@ sub tables_hashref {
         'pkgdiscountnum',        'int',        '', '', '', '', 
         'amount',          @money_type,                '', '', 
         'months',            'decimal', 'NULL', '7,4', '', '',
+        'billpkgdiscountnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'billpkgdiscountnum',
       'unique'       => [],
@@ -3065,6 +3099,7 @@ sub tables_hashref {
         'pkgdiscountnum',        'int',        '', '', '', '', 
         'amount',          @money_type,                '', '', 
         'months',            'decimal', 'NULL', '7,4', '', '',
+        'billpkgdiscountnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'billpkgdiscountnum',
       'unique'       => [],
@@ -3091,6 +3126,7 @@ sub tables_hashref {
         'disabled',      'char', 'NULL',       1, '', '', 
         'setup',         'char', 'NULL',       1, '', '', 
         #'linked',        'char', 'NULL',       1, '', '',
+        'discountnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'discountnum',
       'unique'       => [],
@@ -3108,6 +3144,7 @@ sub tables_hashref {
         'classname',   'varchar',  '', $char_d, '', '', 
         #'categorynum', 'int',  'NULL',      '', '', '', 
         'disabled',    'char', 'NULL',       1, '', '', 
+        'classnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key' => 'classnum',
       'unique' => [],
@@ -3140,6 +3177,7 @@ sub tables_hashref {
         'auth',       'varchar','NULL',16, '', '', # CC auth number
         'order_number', 'varchar','NULL',$char_d, '', '', # transaction number
         'is_tokenized',   'char', 'NULL',    1, '', '', 
+        'refundnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'refundnum',
       'unique'       => [],
@@ -3171,6 +3209,7 @@ sub tables_hashref {
         'refundnum',  'int',     '',   '', '', '', 
         'amount',  @money_type, '', '', 
         '_date',   @date_type, '', '', 
+        'creditrefundnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'creditrefundnum',
       'unique'       => [],
@@ -3193,6 +3232,7 @@ sub tables_hashref {
         'svcpart',        'int',     '', '', '', '', 
         'agent_svcid',    'int', 'NULL', '', '', '',
         'overlimit',           @date_type,   '', '', 
+        'svcnum_import',  'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'svcnum',
       'unique'       => [],
@@ -3649,6 +3689,7 @@ sub tables_hashref {
         'hidden',        'char', 'NULL', 1, '', '',
         'bulk_skip',     'char', 'NULL', 1, '', '',
         'provision_hold', 'char', 'NULL', 1, '', '',
+        'pkgsvcnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'pkgsvcnum',
       'unique'       => [ ['pkgpart', 'svcpart'] ],
@@ -3670,6 +3711,7 @@ sub tables_hashref {
         'disabled', 'char',   'NULL',         1, '', '', 
         'agentnum', 'int',    'NULL',        '', '', '',
         'title',   'varchar', 'NULL',   $char_d, '', '', 
+        'refnum_import', 'int', 'NULL',      '', '', '',
       ],
       'primary_key'  => 'refnum',
       'unique'       => [ ['agentnum', 'title'] ],
@@ -3692,6 +3734,7 @@ sub tables_hashref {
         'classnum',               'int', 'NULL',        '', '', '',
         'restrict_edit_password','char', 'NULL',         1, '', '',
         'has_router',            'char', 'NULL',         1, '', '',
+        'svcpart_import',         'int', 'NULL',        '', '', '',
 ],
       'primary_key'  => 'svcpart',
       'unique'       => [],
@@ -3712,6 +3755,7 @@ sub tables_hashref {
         'columnvalue', 'varchar', 'NULL',     512, '', '', 
         'columnflag',  'char',    'NULL',       1, '', '', 
         'required',    'char',    'NULL',       1, '', '', 
+        'columnnum_import', 'int', 'NULL',     '', '', '',
       ],
       'primary_key'  => 'columnnum',
       'unique'       => [ [ 'svcpart', 'columnname' ] ],
@@ -3727,7 +3771,8 @@ sub tables_hashref {
       'columns' => [
         'classnum',    'serial',   '',      '', '', '', 
         'classname',   'varchar',  '', $char_d, '', '', 
-        'disabled',    'char', 'NULL',       1, '', '', 
+        'disabled',    'char', 'NULL',       1, '', '',
+        'classnum_import', 'int', 'NULL',   '', '', '',
       ],
       'primary_key' => 'classnum',
       'unique' => [],
@@ -3863,6 +3908,7 @@ sub tables_hashref {
     'svc_acct' => {
       'columns' => [
         'svcnum',    'int',    '',   '', '', '', 
+        'svcnum_import',  'int', 'NULL', '', '', '',
         'username',  'varchar',   '',   $username_len, '', '',
         '_password', 'varchar',   'NULL',  512, '', '',
         '_password_encoding', 'varchar', 'NULL', $char_d, '', '',
@@ -3995,6 +4041,7 @@ sub tables_hashref {
     'svc_domain' => {
       'columns' => [
         'svcnum',           'int',    '',        '', '', '',
+        'svcnum_import',    'int', 'NULL',       '', '', '',
         'domain',       'varchar',    '',   $char_d, '', '',
 	'suffix',       'varchar', 'NULL',  $char_d, '', '',
         'catchall',         'int', 'NULL',       '', '', '',
@@ -4168,7 +4215,7 @@ sub tables_hashref {
         'note',     'text',    'NULL',      '', '', '',
       ],
       'primary_key'  => 'svcnum',
-      'unique'       => [],
+      'unique'       => [ ['typenum', 'serial'], ['ip_addr'], ['hw_addr'] ],
       'index'        => [],
       'foreign_keys' => [
                           { columns    => [ 'svcnum' ],
@@ -4536,10 +4583,11 @@ sub tables_hashref {
 
     'export_svc' => {
       'columns' => [
-        'exportsvcnum' => 'serial', '', '', '', '', 
-        'exportnum'    => 'int', '', '', '', '', 
-        'svcpart'      => 'int', '', '', '', '', 
-        'role'         => 'varchar', 'NULL', 16, '', '',
+        'exportsvcnum', 'serial', '', '', '', '', 
+        'exportnum',       'int', '', '', '', '', 
+        'svcpart',         'int', '', '', '', '', 
+        'role',        'varchar', 'NULL', 16, '', '',
+        'exportsvcnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'exportsvcnum',
       'unique'       => [ [ 'exportnum', 'svcpart' ] ],
@@ -4603,6 +4651,7 @@ sub tables_hashref {
         'default_machine','int', 'NULL',      '', '', '',
         'no_suspend',    'char', 'NULL',       1, '', '',
         # could also have 'no_insert', 'no_replace', etc.
+        'exportnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'exportnum',
       'unique'       => [],
@@ -4621,6 +4670,7 @@ sub tables_hashref {
         'exportnum', 'int', '', '', '', '', 
         'optionname', 'varchar', '', $char_d, '', '', 
         'optionvalue', 'text', 'NULL', '', '', '', 
+        'optionnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'optionnum',
       'unique'       => [],
@@ -4638,6 +4688,7 @@ sub tables_hashref {
         'svcnum',       'int', '', '', '', '', 
         'groupname',    'varchar', 'NULL', $char_d, '', '', #deprecated
         'groupnum',     'int', 'NULL', '', '', '', 
+        'usergroupnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'usergroupnum',
       'unique'       => [],
@@ -4660,6 +4711,7 @@ sub tables_hashref {
         'priority', 'int', '', '', '1', '',
         'speed_up', 'int', 'NULL', '', '', '',
         'speed_down', 'int', 'NULL', '', '', '',
+        'groupnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key' => 'groupnum',
       'unique'      => [ ['groupname'] ],
@@ -4869,6 +4921,7 @@ sub tables_hashref {
     'svc_broadband' => {
       'columns' => [
         'svcnum',                  'int',     '',        '', '', '', 
+        'svcnum_import',    'int', 'NULL',       '', '', '',
         'description',         'varchar', 'NULL',   $char_d, '', '', 
         'routernum',               'int', 'NULL',        '', '', '',
         'blocknum',                'int', 'NULL',        '', '', '', 
@@ -5076,6 +5129,7 @@ sub tables_hashref {
         'refundnum',  'int', '', '', '', '', 
         '_date',    @date_type, '', '', 
         'amount',   @money_type, '', '', 
+        'payrefundnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'payrefundnum',
       'unique'       => [],
@@ -5096,6 +5150,7 @@ sub tables_hashref {
         'pkgpart', 'int', '', '', '', '', 
         'optionname', 'varchar', '', $char_d, '', '', 
         'optionvalue', 'text', 'NULL', '', '', '', 
+        'optionnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'optionnum',
       'unique'       => [],
@@ -5183,6 +5238,7 @@ sub tables_hashref {
         'fccoptionname', 'varchar', '', $char_d, '', '',
         'pkgpart',       'int', '', '', '', '',
         'optionvalue',   'varchar', 'NULL', $char_d, '', '',
+        'num_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key' => 'num',
       'unique'      => [ [ 'fccoptionname', 'pkgpart' ] ],
@@ -5191,13 +5247,14 @@ sub tables_hashref {
 
     'rate' => {
       'columns' => [
-        'ratenum',          'serial',     '', '', '', '', 
-        'ratename',        'varchar', '',$char_d, '', '', 
-        'agentnum',            'int', 'NULL', '', '', '',
-        'default_detailnum',   'int', 'NULL', '', '', '',
+        'ratenum',          'serial',     '',      '', '', '', 
+        'ratename',        'varchar',     '', $char_d, '', '', 
+        'agentnum',            'int', 'NULL',      '', '', '',
+        'default_detailnum',   'int', 'NULL',      '', '', '',
+        'agent_rateid',    'varchar', 'NULL', $char_d, '', '',
       ],
       'primary_key' => 'ratenum',
-      'unique'      => [],
+      'unique'      => [ ['agentnum','agent_rateid'], ],
       'index'       => [],
       'foreign_keys' => [
                           { columns    => [ 'agentnum' ],
@@ -5260,10 +5317,11 @@ sub tables_hashref {
         'regionnum',   'serial',      '', '', '', '', 
         'regionname',  'varchar',     '', $char_d, '', '', 
         'exact_match', 'char',    'NULL',  1, '', '',
+        'agent_regionid',    'varchar', 'NULL', $char_d, '', '',
       ],
       'primary_key' => 'regionnum',
       'unique'      => [],
-      'index'       => [],
+      'index'       => [ ['agent_regionid'] ],
     },
 
     'rate_prefix' => {
@@ -5511,6 +5569,7 @@ sub tables_hashref {
         'ticketing_queueid',     'int', 'NULL',      '', '', '', 
         'condense',             'char', 'NULL',       1, '', '', 
         'disabled',             'char', 'NULL',       1, '', '', 
+        'categorunum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key' => 'categorynum',
       'unique' => [],
@@ -5524,6 +5583,7 @@ sub tables_hashref {
         'categorynum', 'int',  'NULL',      '', '', '', 
         'disabled',    'char', 'NULL',       1, '', '', 
         'fcc_ds0s',      'int',     'NULL', '', '', '', 
+        'classnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'classnum',
       'unique'       => [],
@@ -5658,6 +5718,9 @@ sub tables_hashref {
         #NULL, done (or something)
         'freesidestatus', 'varchar',   'NULL',     32,   '', '', 
 
+        #additional status info (i.e. reason for "skipped" freesidestatus)
+        'freesidestatustext', 'text',  'NULL',     '',   '', '',
+
         #NULL, done (or something)
         'freesiderewritestatus', 'varchar',   'NULL',     32,   '', '', 
 
@@ -6289,6 +6352,7 @@ sub tables_hashref {
         'typenum',   'serial',  '', '', '', '', 
         'class',     'char', '', 1, '', '', 
         'type',     'varchar', '', $char_d, '', '', 
+        'typenum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key' => 'typenum',
       'unique' => [],
@@ -6307,6 +6371,7 @@ sub tables_hashref {
         'feepart',        'int', 'NULL', '', '', '',
         'fee_on_unsuspend','char',  'NULL', 1, '', '',
         'fee_hold',      'char',    'NULL', 1, '', '',
+        'reasonnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'reasonnum',
       'unique'       => [],
@@ -6346,6 +6411,7 @@ sub tables_hashref {
         'pkgrefnum',     'serial', '', '', '', '',
         'pkgnum',        'int',    '', '', '', '',
         'refnum',        'int',    '', '', '', '',
+        'pkgrefnum_import', 'int', 'NULL', '', '', '',
       ],
       'primary_key'  => 'pkgrefnum',
       'unique'       => [ [ 'pkgnum', 'refnum' ] ],
@@ -6902,7 +6968,7 @@ sub tables_hashref {
         'mac_addr',  'varchar', 'NULL',      12, '', '', 
       ],
       'primary_key'  => 'svcnum',
-      'unique'       => [ ['serialnum'] , ['mac_addr'] ],
+      'unique'       => [ ['modelnum', 'serialnum'] , ['mac_addr'] ],
       'index'        => [],
       'foreign_keys' => [
                           { columns    => [ 'svcnum' ],
@@ -7665,11 +7731,11 @@ sub tables_hashref {
       ],
     },
 
-    realestate_location => {
+    'realestate_location' => {
       'columns' => [
         'realestatelocnum', 'serial',  '',     '',      '', '',
         'agentnum',         'int',     'NULL', '',      '', '',
-       'location_title',   'varchar', '',     $char_d, '', '',
+        'location_title',   'varchar', '',     $char_d, '', '',
         'address1',         'varchar', 'NULL', $char_d, '',  '',
         'address2',         'varchar', 'NULL', $char_d, '',  '',
         'city',             'varchar', 'NULL', $char_d, '',  '',
@@ -7677,23 +7743,39 @@ sub tables_hashref {
         'zip',              'char',    'NULL', 5,       '',  '',
         'disabled',         'char',    'NULL', 1,       '',  '',
       ],
-      primary_key  => 'realestatelocnum',
-      'unique'     => [ ['location_title'] ],
-      'index'      => [ ['agentnum'], ['disabled'] ],
+      'primary_key'  => 'realestatelocnum',
+      'unique'       => [ ['location_title'] ],
+      'index'        => [ ['agentnum'], ['disabled'] ],
       'foreign_keys' => [
         {columns => ['agentnum'], table => 'agent'},
       ],
     },
 
-    svc_realestate => {
-      columns => [
+    'svc_realestate' => {
+      'columns' => [
         'svcnum',        'serial',  '',     '',      '', '',
         'realestatenum', 'int',     'NULL', '',      '', '',
       ],
-      primary_key => 'svcnum',
-      index => [],
+      'primary_key' => 'svcnum',
+      'index'       => [],
+    },
+
+    'svc_group' => {
+      'columns' => [
+        'svcnum',          'int', '', '', '', '', 
+        'max_accounts',    'int', '', '', '', '',
+      ],
+      'primary_key'  => 'svcnum',
+      'unique'       => [],
+      'index'        => [],
+      'foreign_keys' => [
+                          { columns    => [ 'svcnum' ],
+                            table      => 'cust_svc',
+                          },
+                        ],
     },
 
+
     # name type nullability length default local
 
     #'new_table' => {