X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FSchema.pm;h=ecfb0e4d270264b2e8166d43b7d6b84ee3b9ee92;hp=e8b3309e2f670b4fd8d7aeba1858115b45adc83f;hb=e3a2ca0a7ef6e0931283136321ba8c1494b37c19;hpb=f4f7bb4086cdaf2699c6d028b76e99b3e9be1e90

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index e8b3309e2..ecfb0e4d2 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.
@@ -3266,14 +3266,26 @@ sub tables_hashref {
       'index'  => [], #recnum
     },
 
+    'areacode'  => {
+      'columns' => [
+        'code',        'char',        '',       3, '', '', 
+        'country',     'char',    'NULL',       2, '', '',
+        'state',       'char',    'NULL',       2, '', '', 
+        'description','varchar',  'NULL',     255, '', '',
+      ], 
+      'primary_key' => 'code',
+      'unique' => [],
+      'index'  => [],
+    },
+
     %{ tables_hashref_torrus() },
 
     # tables of ours for doing torrus virtual port combining
     'torrus_srvderive' => {
       'columns' => [
-        'derivenum',  'serial', '', '', '', '',
-        'serviceid', 'varchar', '', 64, '', '', #srvexport / reportfields
-        #'func',      'varchar', '', $char_d, '', '',
+        'derivenum',     'serial',     '', '', '', '',
+        'serviceid',    'varchar',     '', 64, '', '', #srvexport / reportfields
+        'last_srv_date',   'date', 'NULL', '', '', '',
       ],
       'primary_key' => 'derivenum',
       'unique' => [ ['serviceid'] ],