X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FSchema.pm;h=ad88f96ffa6d22de711ad376c0e627ea97f16d85;hb=e5683945ae51a6f14ad62facfd60357aff196f13;hp=b092063e83e2d18ff9bb1489d50aa35fba0ae064;hpb=a8944edbf9043e38df231ad6495f375f8655b585;p=freeside.git

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index b092063e8..ad88f96ff 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2289,6 +2289,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' => [],
@@ -2681,6 +2682,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'       => [],
@@ -5131,13 +5133,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' ],
@@ -5200,10 +5203,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' => {
@@ -5598,6 +5602,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,   '', '', 
 
@@ -5616,6 +5623,9 @@ sub tables_hashref {
         # FK to cust_bill_pkg_detail; having a value here absolutely means
         # that the CDR appears on an invoice
         'detailnum',     'bigint',    'NULL',      '', '', '',
+
+        #for mediation/deduplication
+        'sipcallid',    'varchar',    'NULL',     255, '', '',
       ],
       'primary_key' => 'acctid',
       'unique' => [],
@@ -5629,7 +5639,7 @@ sub tables_hashref {
                    [ 'freesidestatus' ], [ 'freesiderewritestatus' ],
                    [ 'cdrbatch' ], [ 'cdrbatchnum' ],
                    [ 'src_ip_addr' ], [ 'dst_ip_addr' ], [ 'dst_term' ],
-                   [ 'detailnum' ],
+                   [ 'detailnum' ], [ 'sipcallid' ],
                  ],
       #no FKs on cdr table... choosing not to throw errors no matter what's
       # thrown in here.  better to have the data.
@@ -7327,6 +7337,7 @@ sub tables_hashref {
         'is_business',    'char',    'NULL', 1,       '', '',
         'active_date',    @date_type,                 '', '',
         'expire_date',    @date_type,                 '', '',
+        'disabled',       'char',    'NULL',       1, '', '',
       ],
       'primary_key' => 'zonenum',
       'unique' => [],
@@ -7542,6 +7553,22 @@ sub tables_hashref {
                          ],
     },
 
+    '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' => {