X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FSchema.pm;h=25eafa34566f4389eb1491ea93407e9730bce5fd;hb=f40cdebc5e55cb0a209f7fd3e8c3858402c71f9f;hp=327c96c4aa340ca8210ab842ed81e3bcd40b55d2;hpb=e356f2ebb6564fe8d5333fc89bb4583ee3cd1fb1;p=freeside.git

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 327c96c4a..25eafa345 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -347,7 +347,7 @@ sub tables_hashref_torrus {
       ],
       'primary_key' => 'id',
       'unique' => [],
-      'index'  => [ ['srv_date'], ['serviceid'], ],
+      'index'  => [ ['srv_date'], ['srv_date', 'srv_time'], ['serviceid'], ],
     },
 
     #Tables for (currently monthly only) report contents.
@@ -982,33 +982,35 @@ sub tables_hashref {
       'columns' => [
         'prospectnum',  'serial',     '',      '', '', '',
         'agentnum',        'int',     '',      '', '', '',
-        'company',     'varchar',     '', $char_d, '', '',
-        #'disabled',     'char', 'NULL',       1, '', '', 
+        'company',     'varchar', 'NULL', $char_d, '', '',
+        'add_date',   @date_type,                  '', '', 
+        'disabled',       'char', 'NULL',       1, '', '', 
+        'custnum',         'int', 'NULL',      '', '', '',
       ],
       'primary_key' => 'prospectnum',
       'unique'      => [],
-      'index'       => [ [ 'company' ], [ 'agentnum' ], ],
+      'index'       => [ [ 'company' ], [ 'agentnum' ], [ 'disabled' ] ],
     },
 
     #eventually use for billing & ship from cust_main too
     #for now, just cust_pkg locations
     'cust_location' => { #'location' now that its prospects too, but...
       'columns' => [
-        'locationnum',  'serial',     '',      '', '', '',
-        'prospectnum',     'int', 'NULL',      '', '', '',
-        'custnum',         'int', 'NULL',      '', '', '',
-        'address1',    'varchar',     '', $char_d, '', '', 
-        'address2',    'varchar', 'NULL', $char_d, '', '', 
-        'city',        'varchar',     '', $char_d, '', '', 
-        'county',      'varchar', 'NULL', $char_d, '', '', 
-        'state',       'varchar', 'NULL', $char_d, '', '', 
-        'zip',         'varchar', 'NULL',      10, '', '', 
-        'country',        'char',     '',       2, '', '', 
-        'geocode',     'varchar', 'NULL',      20, '', '',
-        'location_type',     'varchar', 'NULL',      20, '', '',
-        'location_number',     'varchar', 'NULL',      20, '', '',
-        'location_kind',     'char', 'NULL',      1, '', '',
-        'disabled',      'char', 'NULL',   1, '', '', 
+        'locationnum',      'serial',     '',      '', '', '',
+        'prospectnum',         'int', 'NULL',      '', '', '',
+        'custnum',             'int', 'NULL',      '', '', '',
+        'address1',        'varchar',     '', $char_d, '', '', 
+        'address2',        'varchar', 'NULL', $char_d, '', '', 
+        'city',            'varchar',     '', $char_d, '', '', 
+        'county',          'varchar', 'NULL', $char_d, '', '', 
+        'state',           'varchar', 'NULL', $char_d, '', '', 
+        'zip',             'varchar', 'NULL',      10, '', '', 
+        'country',            'char',     '',       2, '', '', 
+        'geocode',         'varchar', 'NULL',      20, '', '',
+        'location_type',   'varchar', 'NULL',      20, '', '',
+        'location_number', 'varchar', 'NULL',      20, '', '',
+        'location_kind',      'char', 'NULL',       1, '', '',
+        'disabled',           'char', 'NULL',       1, '', '', 
       ],
       'primary_key' => 'locationnum',
       'unique'      => [],
@@ -1428,11 +1430,12 @@ sub tables_hashref {
         'manual_flag',        'char', 'NULL',  1, '', '', 
         'no_auto',            'char', 'NULL',  1, '', '', 
         'quantity',            'int', 'NULL', '', '', '',
+        'agent_pkgid',         'int', 'NULL', '', '', '',
       ],
       'primary_key' => 'pkgnum',
       'unique' => [],
       'index' => [ ['custnum'], ['pkgpart'], [ 'pkgbatch' ], [ 'locationnum' ],
-                   [ 'usernum' ],
+                   [ 'usernum' ], [ 'agent_pkgid' ],
                    [ 'start_date' ], ['setup'], ['last_bill'], ['bill'],
                    ['susp'], ['adjourn'], ['expire'], ['cancel'],
                    ['change_date'], ['order_date'],
@@ -2409,8 +2412,8 @@ sub tables_hashref {
 
     'svc_external' => {
       'columns' => [
-        'svcnum', 'int', '', '', '', '', 
-        'id',     'int', 'NULL', '', '', '', 
+        'svcnum',     'int',     '',      '', '', '', 
+        'id',      'bigint', 'NULL',      '', '', '', 
         'title',  'varchar', 'NULL', $char_d, '', '', 
       ],
       'primary_key' => 'svcnum',
@@ -3265,8 +3268,44 @@ sub tables_hashref {
       'index'  => [], #recnum
     },
 
+    'areacode'  => {
+      'columns' => [
+        'areanum',   'serial',        '',      '', '', '',
+        'code',        'char',        '',       3, '', '', 
+        'country',     'char',    'NULL',       2, '', '',
+        'state',       'char',    'NULL',       2, '', '', 
+        'description','varchar',  'NULL',     255, '', '',
+      ], 
+      'primary_key' => 'areanum',
+      'unique' => [ [ 'areanum' ] ],
+      'index'  => [],
+    },
+
     %{ tables_hashref_torrus() },
 
+    # tables of ours for doing torrus virtual port combining
+    'torrus_srvderive' => {
+      'columns' => [
+        'derivenum',     'serial',     '', '', '', '',
+        'serviceid',    'varchar',     '', 64, '', '', #srvexport / reportfields
+        'last_srv_date',   'date', 'NULL', '', '', '',
+      ],
+      'primary_key' => 'derivenum',
+      'unique' => [ ['serviceid'] ],
+      'index'  => [],
+    },
+
+    'torrus_srvderive_component' => {
+      'columns' => [
+        'componentnum', 'serial', '', '', '', '',
+        'derivenum',       'int', '', '', '', '',
+        'serviceid',   'varchar', '', 64, '', '', #srvexport / reportfields
+      ],
+      'primary_key' => 'componentnum',
+      'unique'      => [ [ 'derivenum', 'serviceid' ], ],
+      'index'       => [ [ 'derivenum', ], ],
+    },
+
 
     # name type nullability length default local